Location in response

Update demo to support location-in-response feature