Changed controller to return Map instead of multimap