tab cleanup, fix subject tag generation