Reducing complexity of implementation in order to be able to add Atlas text search token based pagination

Reducing complexity of implementation in order to be able to add Atlas text search token based pagination #740