Improvements for allowed html tags in #1635