More bug fixes to the Web Handlers