WIP: Style
Fix search.clear()
Make query part of the search object