Improve filter (remove empty tags…)