Minor fixes + TagsView