Update to sensible 'search' parameters

There is no reason to require special treatment of 'q', it is only annoying to have to treat it specially.