more query changes