Leaving sorting responsability for query executer, instead of lazy object list

Change-Id: I967589ee5145f3a72f61662db1e5d77a24d847f9