fix form global search
merge