[Jaws_Registry]: Added order by to queries