Controller Search finished
Merge fix errors