many fixes and added caps controller to allow search