Covers for the tag editor N+1

Still unstable, but improvements were made!