merged changes from task-list-refactor2-search to rebased master

merged towards rebased master - query performance tests passed