Search issue fixed