Fix tags/map header alignment