Add support for free-form queries, and update UI
UI tweaks