Move logic out of manager and back into tag where it should be.