ENHANCEMENT More filter to reduec the load on search

[ticket: #X]
ENHANCEMENT Handle the redirect properly

[ticket: #X]