better admin handling, an attempt at fixing tag wrapping (slightly successful)