add more query stuff