Fix search

The new search parameter `q` was being encoded, which breaks when you specify additional search parameters.  This should fix that.  I also updated the search tests to be working.