Matching based on queries - refactor - breaks old matchers
version 0.1.0