fixes for querying content