Stories 49909971, 50076695: fixing search issues