simplified

move the combining to the server instead of in angular.