use a regex instead of simple text match for better error catching
more testing around our query