[TIDOC-1059] Refactor, comment and use old search for offline version