Reordered allTags

Added missing tags
Removed trailing spaces