UP-3514 fix request mapping for all use cases and map correct attributes