Added a new query matcher