Fix tags display
some refactoring; fix empty tags adding
Some more tests; tag remove; some changes