Partially hacky fix to make the query visible (and editable). Still need to update builders.