fix for some querying