refactoring: query.match as set of expressions
fix: (expr) AS alias