diff --git a/components/homepage/login.js b/components/homepage/login.js
index ed565c0c..c47d0b0f 100644
--- a/components/homepage/login.js
+++ b/components/homepage/login.js
@@ -56,7 +56,13 @@ const RenderTextfield = ({
                         {error}
                     </span>
                 )}
-                <input {...input} className={className} name={name} id={id} />
+                <input
+                    {...input}
+                    className={className}
+                    name={name}
+                    id={id}
+                    autoComplete="username"
+                />
             </div>
         </>
     );
@@ -102,6 +108,7 @@ const RenderPasswordfield = ({
                     className={className}
                     name={name}
                     id={id}
+                    autoComplete="current-password"
                 />
             </div>
         </>
diff --git a/pages/api/endpoint/getbasicdnssearchdetails_api.js b/pages/api/endpoint/getbasicdnssearchdetails_api.js
index cbb032cc..017445bd 100644
--- a/pages/api/endpoint/getbasicdnssearchdetails_api.js
+++ b/pages/api/endpoint/getbasicdnssearchdetails_api.js
@@ -29,7 +29,7 @@ export default async function ApiProxy(req, res) {
     var queryUrl =
         "pinswg_dnses?$filter=pinswg_name eq '" +
         caseReference +
-        "'&$count=true";
+        " and statuscode eq 1&$count=true";
 
     queryUrl = queryUrl + getSelectQuery("pinswg_dnses");
 
diff --git a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js
index 8501cbfd..b0b9c0bc 100644
--- a/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js
+++ b/pages/api/endpoint/getbasicdnssearchdetailspaged_api.js
@@ -29,7 +29,7 @@ export default async function ApiProxy(req, res) {
     var queryUrl =
         "pinswg_dnses?$filter=pinswg_name eq '" +
         caseReference +
-        "'&$count=true";
+        " and statuscode eq 1&$count=true";
 
     queryUrl = queryUrl + getSelectQuery("pinswg_dnses");
 
diff --git a/pages/api/endpoint/getbasicsearchdetails_api.js b/pages/api/endpoint/getbasicsearchdetails_api.js
index 7ed4f899..8de45336 100644
--- a/pages/api/endpoint/getbasicsearchdetails_api.js
+++ b/pages/api/endpoint/getbasicsearchdetails_api.js
@@ -30,7 +30,7 @@ export default async function ApiProxy(req, res) {
         primaryIdAttribute +
         "s_value eq " +
         incidentID +
-        "&$count=true";
+        " and statuscode eq 1&$count=true";
 
     queryUrl = queryUrl + getSelectQuery(appealTypeName);
 
diff --git a/pages/api/endpoint/getbasicsearchdetailspaged_api.js b/pages/api/endpoint/getbasicsearchdetailspaged_api.js
index 7a37841d..57a1389e 100644
--- a/pages/api/endpoint/getbasicsearchdetailspaged_api.js
+++ b/pages/api/endpoint/getbasicsearchdetailspaged_api.js
@@ -34,7 +34,7 @@ export default async function ApiProxy(req, res) {
         primaryIdAttribute +
         "s_value eq " +
         incidentID +
-        "&$count=true";
+        " and statuscode eq 1&$count=true";
 
     queryUrl = queryUrl + getSelectQuery(appealTypeName);