Make sure query filter gets enabled.
Minor code cleanup.