Handle multiple controls added in one response, fixes #839