Fix query and update progress bar.
Merge pull request #6 from adam-vessey/7.x-fix-accessible-query

Fix query and update progress bar.