cleanup, get tags working again