before fix search
fixed search issues