MODE-2259 Fixed the WebApp handlers.