Controller added and search integrated