Merge pull request #190 from subugoe/ADWD-1532

[TASK] ADWD-1532 Optimize Solr Queue