OOIION-1208 part 1/2

commented code cleaned up
modified the location of limit/offset values sent to ElasticSearch previously, values were one level too deep (eg query->query->limit) values are now at proper level
modified unit tests

part of OOIION-1208 (other part ion-ux)