fixed match querying being broken