refactor Query code
redex reduction graph floating