I think we could use a test case or two here with query regexp matches.