added htmlsafe validation annotation, more regex