Fixed issue with using includes with group or order options in find() and findAll()