[Jaws_ORM]: Fixed using sub-query