Rename variable to make logic errors less likely.
Coding standards.
Merge pull request #1 from gauthierm/nburka-fix-search-queue-logic

Nburka fix search queue logic