added query name fields