Hack to fix #2 and other stuff to clean up search parameters.