Bird finder

Change to `expected_query`. Also use `AND` instead of `and` it's easier to read.