fixed search
merged