Fixing the merge bug, search page ok