PLA-984 moved solr query to another function
PLA-984 removed debug
Merge branch 'PLA-984' into PLA-986