more fixes & findOne helper function