Fixed and updated forward declarations for queries.