Eliminate s.q from CGI params, just use 'q'
NEXT-1060 - Upgrade Blacklight Gem / now at 4.7