Fixed queries to show up but still have issues when updating