cover a few more REST cases and started switching to response builder
more REST response conversion and fixed broken units