Feature/pol1 744 fix speed issues

Does not include IMS changes (need for this work still unclear), does fix the issues with the speed endpoint.