Fixed a service and added to controller