Fixed methods find() and findAll() for work in different ways