* Now when we query a collection of objects from DB we don't use paginated query if query set is not limited * In case of paginated query we now always insert "id" into sort keys to avoid possible looping for multiple paginated querying * Minor cosmetic changes Change-Id: Ie4707b04a97c7fa17dcf278c74e2e852346ac33c