fix: query matching