two bug fixes
restricted tags to certain characters