TagService finished for real this time
Merge
Minor fixes