remove EncodingTags class
add missing refactoring from previous commits
fix NPE in tests