Feature/fix map header