Refactoring  level query vars.