diff --git a/.DS_Store b/.DS_Store
index d3182677..19d58b18 100644
Binary files a/.DS_Store and b/.DS_Store differ
diff --git a/claimManagement/.DS_Store b/claimManagement/.DS_Store
index fc486708..0798ffc3 100644
Binary files a/claimManagement/.DS_Store and b/claimManagement/.DS_Store differ
diff --git a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql
index 66230f0a..f4354e92 100644
--- a/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql
+++ b/claimManagement/src/main/graphql/org.openimis.imisclaim/GetClaims.graphql
@@ -1,6 +1,5 @@
-query GetClaims($claim_administrator_code: String, $status_claim: Int, $visit_date_from: Date, $visit_date_to: Date, $processed_date_from: Date, $processed_date_to: Date) {
+query GetClaims($status_claim: Int, $visit_date_from: Date, $visit_date_to: Date, $processed_date_from: Date, $processed_date_to: Date) {
   claims(
-    admin_Code: $claim_administrator_code
     status: $status_claim
     dateClaimed_Gte: $visit_date_from
     dateClaimed_Lte: $visit_date_to
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java b/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java
index d201029d..9e863b79 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/SearchClaimsActivity.java
@@ -156,8 +156,7 @@ private void getClaims(
         new Thread(() -> {
 
             try {
-                List<Claim> claims = new FetchClaims().execute(
-                        claimAdministratorCode, status, visitDateFrom,
+                List<Claim> claims = new FetchClaims().execute( status, visitDateFrom,
                         visitDateTo, processedDateFrom, processedDateTo
                 );
                 pd.dismiss();
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
index 85f85803..65986297 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/domain/entity/Claim.java
@@ -177,7 +177,7 @@ protected Claim(Parcel in) {
         if (in.readByte() == 0) {
             status = null;
         } else {
-            status = Claim.Status.valueOf(in.readString());
+            status = Status.valueOf(in.readString());
         }
     }
 
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java b/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java
index 1cf0c4de..ee0a6369 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/network/request/GetClaimsGraphQLRequest.java
@@ -15,7 +15,6 @@ public class GetClaimsGraphQLRequest extends BaseGraphQLRequest {
     @NonNull
     @WorkerThread
     public GetClaimsQuery.Claims get(
-            @Nullable String claimAdministratorCode,
             @Nullable Integer status,
             @Nullable Date visitDateFrom,
             @Nullable Date visitDateTo,
@@ -23,7 +22,6 @@ public GetClaimsQuery.Claims get(
             @Nullable Date processedDateTo
     ) throws Exception {
         return makeSynchronous(new GetClaimsQuery(
-                Input.fromNullable(claimAdministratorCode),
                 Input.fromNullable(status),
                 Input.fromNullable(visitDateFrom),
                 Input.fromNullable(visitDateTo),
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java b/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java
index 3b59abed..c0d521f8 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/network/util/OkHttpUtils.java
@@ -8,6 +8,8 @@
 import org.openimis.imisclaims.Global;
 import org.openimis.imisclaims.network.okhttp.AuthorizationInterceptor;
 
+import java.util.concurrent.TimeUnit;
+
 import javax.net.ssl.SSLContext;
 import javax.net.ssl.TrustManager;
 import javax.net.ssl.X509TrustManager;
@@ -29,6 +31,7 @@ public static OkHttpClient getDefaultOkHttpClient() {
             synchronized (OkHttpUtils.class) {
                 if (client == null) {
                     OkHttpClient.Builder builder = new OkHttpClient.Builder();
+                    builder.readTimeout(2000, TimeUnit.SECONDS);
                     HttpLoggingInterceptor interceptor = new HttpLoggingInterceptor();
                     interceptor.setLevel(BuildConfig.DEBUG ? HttpLoggingInterceptor.Level.BODY : HttpLoggingInterceptor.Level.BASIC);
                     builder.addInterceptor(interceptor);
diff --git a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java
index 7a7f6e34..d7c8be95 100644
--- a/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java
+++ b/claimManagement/src/main/java/org/openimis/imisclaims/usecase/FetchClaims.java
@@ -31,7 +31,6 @@ public FetchClaims(
     @WorkerThread
     @NonNull
     public List<Claim> execute(
-            @Nullable String claimAdministratorCode,
             @Nullable Claim.Status status,
             @Nullable Date visitDateFrom,
             @Nullable Date visitDateTo,
@@ -41,7 +40,6 @@ public List<Claim> execute(
         Mapper<GetClaimsQuery.Service, Claim.Service> serviceMapper = new Mapper<>(this::toService);
         Mapper<GetClaimsQuery.Item, Claim.Medication> medicationMapper = new Mapper<>(this::toMedication);
         return Mapper.map(request.get(
-                claimAdministratorCode,
                 statusAsInt(status),
                 visitDateFrom,
                 visitDateTo,