removed delimiting code, added support to look at the entire query, even if part of it doesn't match