Removed attributes (hash-map can be used); Added html-encode