WIP: Moar work on the query widget

Not sure why the buttons aren't working