Fix findOne() to hit the primary key