Some UI fixed for the query interface