Model events grouping adjustment
HTML escaping refactoring
Text setting/updating and filtering adjustment