Wrap query in search polling

Also drops the increment from 5 to 1 since default solr4 soft commit is 1 second.