diff --git a/provider/indexer-aws/CloudFormation/Automated/ecs.yml b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
index 3ddb30832742c86c3bccf2e9e681d32e3e77b9e5..c3ac4968c2d708f6472f7fa752923c96c7f9ce5e 100644
--- a/provider/indexer-aws/CloudFormation/Automated/ecs.yml
+++ b/provider/indexer-aws/CloudFormation/Automated/ecs.yml
@@ -390,7 +390,7 @@ Resources:
             - Name: AWS_QUEUE_INDEXER_NAME
               Value: dev-osdu-storage-queue
             - Name: AWS_INDEXER_INDEX_API
-              Value: ECSALB-os-indexer-1927005132.us-east-1.elb.amazonaws.com/api/indexer/v2/_dps/task-handlers/index-worker
+              Value: http://ECSALB-os-indexer-1927005132.us-east-1.elb.amazonaws.com/api/indexer/v2/_dps/task-handlers/index-worker
             - Name: AWS_DEADLETTER_QUEUE_NAME
               Value: dev-osdu-storage-dead-letter-queue
             - Name: MAX_INDEX_THREADS
diff --git a/provider/indexer-aws/CloudFormation/Automated/iam-credentials.yml b/provider/indexer-aws/CloudFormation/Automated/iam-credentials.yml
index de3429d512c4424edf55db5d9cb6a476821269c1..e1ab80466f6cb4bb185bc2256aaa11d77752e8ad 100644
--- a/provider/indexer-aws/CloudFormation/Automated/iam-credentials.yml
+++ b/provider/indexer-aws/CloudFormation/Automated/iam-credentials.yml
@@ -62,7 +62,6 @@ Resources:
                   - 'sns:*'
                   - 'sqs:*'
                   - 'dynamodb:*'
-                  - 'es:*'
                   - 'logs:*'
                   - 'cloudwatch:*'
                 Effect: Allow
diff --git a/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueService.java b/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueService.java
index 3bfa1eb08a6674e44517f12a3399b5faa45cc95c..0472d46029c840e61ac6bb4e00b55199433e129e 100644
--- a/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueService.java
+++ b/provider/indexer-aws/indexer-queue-aws/src/main/java/org/opengroup/osdu/indexerqueue/aws/api/IndexerQueueService.java
@@ -87,6 +87,7 @@ public class IndexerQueueService {
             List<Message> retrievedMessages = sqsClient.receiveMessage(receiveMessageRequest).getMessages();
             messages.addAll(retrievedMessages);
             numOfMessages = retrievedMessages.size();
+
         }while (messages.size() < maxMessageCount && numOfMessages > 0);
 
         return messages;