improving findBy