add all the function of getting category search
change the category search
fix merge problem
fix merge problem