response parsing improvements