Prefer find_by() instead of where().first

Prefer find_by() instead of where().first #696