FindOne: fixes & refactoring