Split out query validation into a serverQuery, edited the watch to monitor this and sorted text inputs in the query builder