Up to feature testing

I prefer find to where for single queries.