@bmlt-enabled/croutonjs 4.1.12 → 4.3.1

package/crouton.nojquery.js

@@ -11186,7 +11186,9 @@ function CroutonLocalization(language) {
 			'all': 'الجميع',
 			'menu': 'القائمة',
 			'search for meetings': 'البحث عن الاجتماعات',
+			'search by location': 'البحث حسب الموقع',
 			'show meetings near...': 'أظهر الاجتماعات بالقرب من...',
+			'closest meetings': 'أقرب الاجتماعات',
 			'filter meetings': 'سرد الاجتماعات',
 			'visible meeting list': 'قائمة الاجتماعات المرئية',
 			'enter a city or zip code': 'أدخل المدينة أو الرمز البريدي',
@@ -11207,6 +11209,9 @@ function CroutonLocalization(language) {
 			"waze": "وايز",
 			"waze_desc": "فتح في تطبيق وايز",
 			'address_lookup_fail': 'تعذر العثور على العنوان. يرجى المحاولة مرة أخرى.',
+			"favorites": "المفضلة",
+			"widen search": "البحث الواسع",
+			"cancel search": "إلغاء البحث"
 		},
 		"cs": {
 			"days_of_the_week": ["", "Neděle", "Pondělí", "Úterý", "Středa", "Čtvrtek", "Pátek", "Sobota"],
@@ -11246,7 +11251,9 @@ function CroutonLocalization(language) {
 			"all": "Jakékoli",
 			"menu": "Menu",
 			"search for meetings": "Hledat setkání",
+			'search by location': 'Vyhledávání podle lokality',
 			"show meetings near...": "Setkání v jiných městech",
+			'closest meetings': "Nejbližší setkání",
 			"filter meetings": "Filtr pro jazyk, formát atd.",
 			"visible meeting list": "Viditelný seznam setkání jako tabulka",
 			"enter a city or zip code": "Město nebo PSČ",
@@ -11257,7 +11264,6 @@ function CroutonLocalization(language) {
 			"meeting details": "Podrobnosti o setkání",
 			"report update": "Nahlásit aktualizaci",
 			"filter by visibility": "Zobrazit pouze setkání, která jsou aktuálně na mapě",
-			"go": "Jít!",
 			"get_directions": "Získat pokyny",
 			"select_map_app": "Vyberte aplikaci pro mapy",
 			"apple_maps": "Apple Mapy",
@@ -11272,6 +11278,9 @@ function CroutonLocalization(language) {
 			"sorted by distance": "Seřazeno podle vzdálenosti",
 			"address_lookup_fail": "Adresu se nepodařilo najít. Zkuste to prosím znovu.",
 			"contact": "Kontakt",
+			"favorites": "Oblíbené",
+			"widen search": "Rozšířit vyhledávání",
+			"cancel search": "Zrušit vyhledávání",
 		},
 		"da-DK": {
 			"days_of_the_week": ["", "Søndag", "Mandag", "Tirsdag", "Onsdag", "Torsdag", "Fredag", "Lørdag"],
@@ -11288,7 +11297,7 @@ function CroutonLocalization(language) {
 			"formats": "Struktur",
 			"map": "Kort",
 			"neighborhood": "Neighborhood",
-			"near_me": "Find nearby meetings",
+			"near_me": "Find closest meetings",
 			"text_search": "Find meetings there",
 			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
@@ -11318,7 +11327,9 @@ function CroutonLocalization(language) {
 			'menu': 'Menu',
 			"bmlt2ics": "Add to your calendar",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Søg efter placering',
 			'show meetings near...': 'Show meetings near...',
+			'closest meetings': 'Nærmeste møder',
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
 			'enter a city or zip code': 'Enter a city or zip code',
@@ -11338,6 +11349,9 @@ function CroutonLocalization(language) {
 			"sorted by distance": "Sorteret efter Afstand",
 			"address_lookup_fail": "Adressen kunne ikke findes. Prøv venligst igen.",
 			"contact": "Kontakt",
+			"favorites": "Favoritter",
+			"widen search": "Udvid søgning",
+			"cancel search": "Annuller søgning",
 		},
 		"de-DE": {
 			"days_of_the_week": ["", "Sonntag", "Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag"],
@@ -11383,7 +11397,9 @@ function CroutonLocalization(language) {
 			'all': 'Alle',
 			'menu': 'Menu',
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Suche nach Standort',
 			'show meetings near...': 'Meetings in andere Städten',
+			'closest meetings': 'Nächstgelegene Meetings',
 			'filter meetings': 'Filter für Sprache, Format usw.',
 			'visible meeting list': 'Sichtbare Meetings als Tabelle',
 			'enter a city or zip code': 'Stadt oder PLZ',
@@ -11394,7 +11410,6 @@ function CroutonLocalization(language) {
 			'meeting details': "Genaueres zum Meeting",
 			'report update': "Report an Update",
 			'filter by visibility': "Zeige nur Meetings, die gerade auf dem Karte stehen",
-			'go': "Los!",
 			"get_directions": "Wegbeschreibung",
 			"select_map_app": "Karten-App auswählen",
 			"apple_maps": "Apple Maps",
@@ -11412,6 +11427,9 @@ function CroutonLocalization(language) {
 			"distance": "Entfernung",
 			"all meetings": "Alle Meetings",
 			'upcoming meetings': "Nächste 24 Stunden",
+			"favorites": "Favoriten",
+			"widen search": "Suche ausweiten",
+			"cancel search": "Abbrechen",
 		},
 		'el-GR': {
 			"days_of_the_week": ["", "Κυριακή", "Δευτέρα", "Τρίτη", "Τετάρτη", "Πέμπτη", "Παρασκευή", "Σάββατο"],
@@ -11457,7 +11475,9 @@ function CroutonLocalization(language) {
 			"all": "",
 			"menu":	"Μενού",
 			"search for meetings":	"Αναζήτηση ομάδων",
+			'search by location': 'Αναζήτηση ανά τοποθεσία',
 			"show meetings near...": "Εμφάνιση ομάδων κοντά σε..",
+			"closest meetings": "Πλησιέστερες Συναντήσεις",
 			"filter meetings": "Φίλτραρε τις ομάδες",
 			"visible meeting list": "Λίστα ορατών ομάδων",
 			"enter a city or zip code": "Εισαγάγετε μια πόλη ή ταχυδρομικό κώδικα",
@@ -11469,7 +11489,6 @@ function CroutonLocalization(language) {
 			"report update": "Ανέφερε ενημέρωση",
 			"filter by visibility": "Φίλτραρε ανα ορατές ομάδες",
 			"open search dialog": "’νοιξε αναζήτηση",
-			"go": "Έναρξη",
 			"get_directions": "Λάβετε οδηγίες",
 			"select_map_app": "Διαλέξτε εφαρμογή χάρτη",
 			"apple_maps": "Χάρτες Apple",
@@ -11504,6 +11523,9 @@ function CroutonLocalization(language) {
 			"meets virtually and in person": "Διαδικτυακή και φυσική ομάδα",
 			"all meetings": "Όλες οι ομάδες",
 			"upcoming meetings": "Προσεχείς ομάδες",
+			"favorites": "Αγαπημένα",
+			"widen search": "Διεύρυνση αναζήτησης",
+			"cancel search": "Ακύρωση αναζήτησης",
 		},
 		"en-AU": {
 			"days_of_the_week": ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -11520,7 +11542,7 @@ function CroutonLocalization(language) {
 			"formats": "Formats",
 			"map": "Map",
 			"neighborhood": "Neighbourhood",
-			"near_me": "Find nearby meetings",
+			"near_me": "Find closest meetings",
 			"text_search": "Find meetings there",
 			"click_search": "Find meetings near to a point on the map",
 			"languages": "Languages",
@@ -11549,7 +11571,9 @@ function CroutonLocalization(language) {
 			'all': 'All',
 			'menu': 'Menu',
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
+			'closest meetings': "Closest Meetings",
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
 			'enter a city or zip code': 'Enter a city and state',
@@ -11572,6 +11596,9 @@ function CroutonLocalization(language) {
 			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
 			"sorted by distance": "Sorted by Distance",
 			"address_lookup_fail": "The address could not be found. Please try again.",
+			"favorites": "Favorites",
+			"widen search": "Widen Search",
+			"cancel search": "Cancel Search",
 		},
 		"en-CA": {
 			"days_of_the_week": ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -11588,7 +11615,7 @@ function CroutonLocalization(language) {
 			"formats": "Formats",
 			"map": "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Find nearby meetings",
+			"near_me": "Find closest meetings",
 			"text_search": "Find meetings there",
 			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
@@ -11617,7 +11644,9 @@ function CroutonLocalization(language) {
 			'all': 'All',
 			'menu': 'Menu',
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
+			'closest meetings': "Closest Meetings",
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
 			'enter a city or zip code': 'Enter a city or zip code',
@@ -11641,6 +11670,9 @@ function CroutonLocalization(language) {
 			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
 			"sorted by distance": "Sorted by Distance",
 			"address_lookup_fail": "The address could not be found. Please try again.",
+			"favorites": "Favorites",
+			"widen search": "Widen Search",
+			"cancel search": "Cancel Search",
 		},
 		"en-NZ": {
 			"days_of_the_week": ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -11657,7 +11689,7 @@ function CroutonLocalization(language) {
 			"formats": "Formats",
 			"map": "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Find nearby meetings",
+			"near_me": "Find closest meetings",
 			"text_search": "Find meetings there",
 			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
@@ -11686,7 +11718,9 @@ function CroutonLocalization(language) {
 			'all': 'All',
 			'menu': 'Menu',
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
+			'closest meetings': "Closest Meetings",
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
 			'enter a city or zip code': 'Enter a city or zip code',
@@ -11710,6 +11744,9 @@ function CroutonLocalization(language) {
 			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
 			"sorted by distance": "Sorted by Distance",
 			"address_lookup_fail": "The address could not be found. Please try again.",
+			"favorites": "Favorites",
+			"widen search": "Widen Search",
+			"cancel search": "Cancel Search",
 		},
 		"en-UK": {
 			"days_of_the_week": ["", "Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"],
@@ -11726,7 +11763,7 @@ function CroutonLocalization(language) {
 			"formats": "Formats",
 			"map": "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Find nearby meetings",
+			"near_me": "Find closest meetings",
 			"text_search": "Find meetings there",
 			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
@@ -11756,7 +11793,9 @@ function CroutonLocalization(language) {
 			'menu': "Menu",
 			"bmlt2ics": "Add to your calendar",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
+			'closest meetings': "Closest Meetings",
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
 			'enter a city or zip code': 'Enter a city or zip code',
@@ -11779,6 +11818,9 @@ function CroutonLocalization(language) {
 			"zoomed-out-message": "We can't search the entire area for meetings. Please zoom in or do a new search.",
 			"sorted by distance": "Sorted by Distance",
 			"address_lookup_fail": "The address could not be found. Please try again.",
+			"favorites": "Favorites",
+			"widen search": "Widen Search",
+			"cancel search": "Cancel Search",
 		},
 
 		"en-US": {
@@ -11796,7 +11838,7 @@ function CroutonLocalization(language) {
 			"formats": "Formats",
 			"map": "Map",
 			"neighborhood": "Neighborhood",
-			"near_me": "Find nearby meetings",
+			"near_me": "Find closest meetings",
 			"text_search": "Find meetings there",
 			"click_search": "Find meetings near to a point on the map",
 			"pan_and_zoom": "Pan + Zoom",
@@ -11825,7 +11867,9 @@ function CroutonLocalization(language) {
 			'all': 'All',
 			'menu': "Menu",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
+			'closest meetings': "Closest Meetings",
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
 			'enter a city or zip code': 'Enter a city or zip code',
@@ -11872,6 +11916,10 @@ function CroutonLocalization(language) {
 			"more info": "More Info",
 			"all meetings": "All Meetings",
 			'upcoming meetings': "Upcoming Meetings",
+			"favorites": "Favorites",
+			"choose one": "Choose one:",
+			"widen search": "Widen Search",
+			"cancel search": "Cancel Search",
 		},
 		"es-US": {
 			"days_of_the_week": ["", "Domingo", "Lunes", "Martes", "Miércoles", "Jueves", "Viernes", "Sábado"],
@@ -11918,7 +11966,9 @@ function CroutonLocalization(language) {
 			'all': 'Todos',
 			'menu': "Menú",
 			'search for meetings': 'Buscar reuniones',
+			'search by location': 'Buscar por ubicación',
 			'show meetings near...': 'Mostrar reuniones cercanas...',
+			'closest meetings': 'Reuniones más cercanas',
 			'filter meetings': 'Filtrar reuniones',
 			'visible meeting list': 'Listado visible de reuniones',
 			'enter a city or zip code': 'Introduce una ciudad o un código postal',
@@ -11942,6 +11992,9 @@ function CroutonLocalization(language) {
 			"zoomed-out-message": "No podemos buscar reuniones en toda la zona. Por favor, acérquese o haga una nueva búsqueda.",
 			"sorted by distance": "Ordenado por distancia",
 			"address_lookup_fail": "The address could not be found. Please try again.",
+			"favorites": "Favoritos",
+			"widen search": "Búsqueda amplia",
+			"cancel search": "Cancelar búsqueda",
 		},
 		"fa-IR": {
 			"days_of_the_week": ["", 'یَکشَنب', 'دوشَنبه', 'سه‌شنبه', 'چهار شنبه', 'پَنج شَنبه', 'جُمعه', 'شَنبه'],
@@ -11994,7 +12047,9 @@ function CroutonLocalization(language) {
 			"all": "همه",
 			"menu": " منوی",
 			"search for meetings": "جستجوی جلسه ها",
+			'search by location': 'جستجو بر اساس مکان',
 			"show meetings near...": "نمایش جلسات نزدیک",
+			"closest meetings": "نزدیک ترین ملاقات ها",
 			"filter meetings": "فیلتر جلسات",
 			"visible meeting list": "جلسات قابل مشاهده به عنوان لیست",
 			"enter a city or zip code": "شهر یا کد پستی را وارد کنید",
@@ -12005,7 +12060,6 @@ function CroutonLocalization(language) {
 			"meeting details": "جزئیات جلسه",
 			"report update": "گزارش به‌روزرسانی",
 			"filter by visibility": "فقط این جلسات را فهرست کنید",
-			"go": "برو",
 			"distance": "فاصله",
 			"get_directions": "دریافت مسیر",
 			"select_map_app": "انتخاب برنامه نقشه",
@@ -12024,6 +12078,9 @@ function CroutonLocalization(language) {
 			'comments': 'توضیحات',
 			'group details': 'نمایش گروه',
 			"address_lookup_fail": "آدرس پیدا نشد. لطفا دوباره تلاش کنید.",
+			"favorites": "مورد علاقه",
+			"widen search": "جستجوی گسترده",
+			"cancel search": "لغو جستجو",
 		},
 		"fr-CA": {
 			"days_of_the_week": ["", "Dimanche", "Lundi", "Mardi", "Mercredi", "Jeudi", "Vendredi", "Samedi"],
@@ -12069,7 +12126,9 @@ function CroutonLocalization(language) {
 			"all": "Tout",
 			"menu": "Menu",
 			"search for meetings": "Rechercher des réunions",
+			'search by location': 'Recherche par localisation',
 			"show meetings near...": "Afficher les réunions près de...",
+			"closest meetings": "Réunions les plus proches",
 			"filter meetings": "Filtrer les réunions",
 			"visible meeting list": "Liste des réunions visibles",
 			"enter a city or zip code": "Entrer une ville ou un code postal",
@@ -12092,6 +12151,9 @@ function CroutonLocalization(language) {
 			"waze_desc": "Ouvrir dans l'application Waze",
 			"sorted by distance": "Trié par distance",
 			"address_lookup_fail": "L'adresse est introuvable. Veuillez réessayer.",
+			"favorites": "Favoris",
+			"widen search": "Recherche élargie",
+			"cancel search": "Annuler la recherche",
 		},
 		"it-IT": {
 			"days_of_the_week": ["", "Domenica", " Lunedì", "Martedì", "Mercoledì", "Giovedì", "Venerdì", "Sabato"],
@@ -12137,7 +12199,9 @@ function CroutonLocalization(language) {
 			'all': 'Tutti',
 			'menu': "Menu",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Cerca per posizione',
 			'show meetings near...': 'Mostra incontri nelle vicinanze..',
+			'closest meetings': "Riunioni più ravvicinati",
 			'filter meetings': 'Filtrare le riunioni',
 			'visible meeting list': 'Elenco riunioni visibile',
 			'enter a city or zip code': 'Inserire una città o un codice postale',
@@ -12160,6 +12224,9 @@ function CroutonLocalization(language) {
 			"waze_desc": "Apri nell'app Waze",
 			"sorted by distance": "Ordinati per distanza",
 			"address_lookup_fail": "L'indirizzo non è stato trovato. Per favore riprova.",
+			"favorites": "Preferiti",
+			"widen search": "Ricerca larga",
+			"cancel search": "Annulla ricerca",
 		},
 		"nl-NL": {
 			"days_of_the_week": ["", "Zondag", "Maandag", "Dinsdag", "Woensdag", "Donderdag", "Vrijdag", "Zaterdag"],
@@ -12205,6 +12272,7 @@ function CroutonLocalization(language) {
 			'all': 'All',
 			'menu': "Menu",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
@@ -12272,6 +12340,7 @@ function CroutonLocalization(language) {
 			'all': 'All',
 			'menu': "Menu",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
@@ -12295,6 +12364,9 @@ function CroutonLocalization(language) {
 			"waze_desc": "Otwórz w aplikacji Waze",
 			"sorted by distance": "Posortowane według odległości",
 			"address_lookup_fail": "The address could not be found. Please try again.",
+			"favorites": "Ulubione",
+			"widen search": "Widen Search",
+			"cancel search": "Cancel Search",
 		},
 		"pt-BR": {
 			"days_of_the_week": ["", "Domingo", "Segunda-feira", "Terça-feira", "Quarta-feira", "Quinta-feira", "Sexta-feira", "Sábado"],
@@ -12341,6 +12413,7 @@ function CroutonLocalization(language) {
 			'menu': "Menu",
 			"bmlt2ics": "Add to your calendar",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
@@ -12363,6 +12436,9 @@ function CroutonLocalization(language) {
 			"waze_desc": "Abrir no aplicativo Waze",
 			"sorted by distance": "Classificado por distância",
 			"address_lookup_fail": "The address could not be found. Please try again.",
+			"favorites": "Favoritos",
+			"widen search": "Widen Search",
+			"cancel search": "Cancel Search",
 		},
 		"ru-RU": {
 			"days_of_the_week": ["", "Воскресенье", "Понедельник", "Вторник", "Среда", "Четверг", "Пятница", "Суббота"],
@@ -12409,7 +12485,9 @@ function CroutonLocalization(language) {
 			'menu': "Меню",
 			"bmlt2ics": "Добавить в календарь",
 			'search for meetings': 'Поиск собраний',
+			'search by location': 'Поиск по местонахождению',
 			'show meetings near...': 'Показывать собрания рядом с...',
+			'closest meetings': 'Ближайшие встречи',
 			'filter meetings': 'Фильтровать собрания',
 			'visible meeting list': 'Собрания в виде списка',
 			'enter a city or zip code': 'Введите город или почтовый индек',
@@ -12419,7 +12497,6 @@ function CroutonLocalization(language) {
 			'meeting details': "Подробности собрания",
 			'report update': "Report an Update",
 			'filter by visibility': "List only these meetings",
-			'go': "Go!",
 			"distance": "Расстояние",
 			"get_directions": "Проложить маршрут",
 			"select_map_app": "Выбрать приложение карт",
@@ -12431,6 +12508,9 @@ function CroutonLocalization(language) {
 			"waze_desc": "Открыть в приложении Waze",
 			"sorted by distance": "Сортировка по расстоянию",
 			"address_lookup_fail": "Адрес не найден. Пожалуйста, попробуйте еще раз.",
+			"favorites": "Избранное",
+			"widen search": "Расширить поиск",
+			"cancel search": "Отмена поиска",
 		},
 		"sk": {
 			"days_of_the_week": ["", "Nedeľa", "Pondelok", "Utorok", "Streda", "Štvrtok", "Piatok", "Sobota"],
@@ -12470,7 +12550,9 @@ function CroutonLocalization(language) {
 			"all": "Akékoľvek",
 			"menu": "Menu",
 			"search for meetings": "Hľadať stretnutia",
+			'search by location': 'Vyhľadávanie podľa lokality',
 			"show meetings near...": "Stretnutia v iných mestách",
+			"closest meetings": "Najbližšie stretnutia",
 			"filter meetings": "Filter pre jazyk, formát atď.",
 			"visible meeting list": "Viditeľné stretnutia ako tabuľka",
 			"enter a city or zip code": "Mesto alebo PSČ",
@@ -12481,7 +12563,6 @@ function CroutonLocalization(language) {
 			"meeting details": "Podrobnosti o stretnutí",
 			"report update": "Nahlásiť aktualizáciu",
 			"filter by visibility": "Zobraziť iba stretnutia, ktoré sú práve na mape",
-			"go": "Ísť!",
 			"get_directions": "Získať trasu",
 			"select_map_app": "Vyberte aplikáciu pre mapy",
 			"apple_maps": "Apple Maps",
@@ -12495,6 +12576,9 @@ function CroutonLocalization(language) {
 			"zoomed-out-message": "Nemôžeme prehľadať celú oblasť pre stretnutia. Prosím, priblížte alebo vykonajte nové vyhľadávanie.",
 			"sorted by distance": "Zoradené podľa vzdialenosti",
 			"address_lookup_fail": "Adresa sa nenašla. Skúste to znova prosím.",
+			"favorites": "Obľúbené",
+			"widen search": "Rozšíriť vyhľadávanie",
+			"cancel search": "Zrušiť vyhľadávanie",
 		},
 		"sv-SE": {
 			"days_of_the_week": ["", "Söndag", "Måndag", "Tisdag", "Onsdag", "Torsdag", "Fredag", "Lördag"],
@@ -12540,6 +12624,7 @@ function CroutonLocalization(language) {
 			'all': 'All',
 			'menu': "Menu",
 			'search for meetings': 'Search for meetings',
+			'search by location': 'Search by Location',
 			'show meetings near...': 'Show meetings near...',
 			'filter meetings': 'Filter meetings',
 			'visible meeting list': 'Visible meetings as list',
@@ -12668,6 +12753,9 @@ function CroutonHandlebarsExtensions() {
 				? options.fn(this)
 				: options.inverse(this);
 		});
+		crouton_Handlebars.registerHelper('format_list_style', function(data, options) {
+			return crouton.config.format_list_style === 'formatNames' ? 'formatNames' : 'formatKeys'
+		});
 		crouton_Handlebars.registerHelper('groupsConfigured', function(data, options) {
 			if (crouton.config.groups) {
 				return getTrueResult(options, this);
@@ -12679,8 +12767,8 @@ function CroutonHandlebarsExtensions() {
 		 * @deprecated Since version 3.12.2, will be removed in a future version.
 		 */
 		crouton_Handlebars.registerHelper('isVirtual', function(data, options) {
-			return ((data['venue_type'] === venueType.HYBRID || data['venue_type'] === venueType.VIRTUAL) || ((inArray(getMasterFormatId('HY', data), getFormats(data)) && !inArray(getMasterFormatId('TC', data), getFormats(data)))
-				|| inArray(getMasterFormatId('VM', data), getFormats(data))))
+			return ((data['venue_type'] === venueType.HYBRID || data['venue_type'] === venueType.VIRTUAL) || ((getFormats(data).includes(getMasterFormatId('HY', data)) && !getFormats(data).includes(getMasterFormatId('TC', data)))
+				|| getFormats(data).includes(getMasterFormatId('VM', data))))
 				&& (data['virtual_meeting_link'] || data['phone_meeting_number'] || data['virtual_meeting_additional_info']) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
@@ -12688,83 +12776,85 @@ function CroutonHandlebarsExtensions() {
 		 * Assumes consistent set of venue type formats (enforced for newly edited meetings in root server 2.16.0 or greater)
 		 */
 		crouton_Handlebars.registerHelper('isVirtualOnly', function(data, options) {
-			return data['venue_type'] === venueType.VIRTUAL || inArray(getMasterFormatId('VM', data), getFormats(data)) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return data['venue_type'] === venueType.VIRTUAL || getFormats(data).includes(getMasterFormatId('VM', data)) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		/**
 		 * @deprecated Since version 3.12.2 will be removed in a future version.
 		 */
 		crouton_Handlebars.registerHelper('isHybrid', function(data, options) {
-			return data['venue_type'] === venueType.HYBRID || inArray(getMasterFormatId('HY', data), getFormats(data)) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return data['venue_type'] === venueType.HYBRID || getFormats(data).includes(getMasterFormatId('HY', data)) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		/**
 		 * Assumes consistent set of venue type formats (enforced for newly edited meetings in root server 2.16.0 or greater)
 		 */
 		crouton_Handlebars.registerHelper('isHybridOnly', function(data, options) {
-			return data['venue_type'] === venueType.HYBRID || inArray(getMasterFormatId('HY', data), getFormats(data)) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return data['venue_type'] === venueType.HYBRID || getFormats(data).includes(getMasterFormatId('HY', data)) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		crouton_Handlebars.registerHelper('isTemporarilyClosed', function(data, options) {
-			return inArray(getMasterFormatId('TC', data), getFormats(data)) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return getFormats(data).includes(getMasterFormatId('TC', data)) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		crouton_Handlebars.registerHelper('isNotTemporarilyClosed', function(data, options) {
-			return !inArray(getMasterFormatId('TC', data), getFormats(data)) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return !getFormats(data).includes(getMasterFormatId('TC', data)) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		/**
 		 * Assumes consistent set of venue type formats (enforced for newly edited meetings in root server 2.16.0 or greater)
 		 */
 		crouton_Handlebars.registerHelper('isInPersonOrHybrid', function(data, options) {
-			return data['venue_type'] !== venueType.VIRTUAL && !inArray(getMasterFormatId('VM', data), getFormats(data)) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return data['venue_type'] !== venueType.VIRTUAL && !getFormats(data).includes(getMasterFormatId('VM', data)) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		/**
 		 * Assumes consistent set of venue type formats (enforced for newly edited meetings in root server 2.16.0 or greater)
 		 */
 		crouton_Handlebars.registerHelper('isInPersonOnly', function(data, options) {
-			return data['venue_type'] === venueType.IN_PERSON || (!inArray(getMasterFormatId('VM', data), getFormats(data))
-				&& !inArray(getMasterFormatId('HY', data), getFormats(data))) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return data['venue_type'] === venueType.IN_PERSON || (!getFormats(data).includes(getMasterFormatId('VM', data))
+				&& !getFormats(data).includes(getMasterFormatId('HY', data))) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		/**
 		 * Assumes consistent set of venue type formats (enforced for newly edited meetings in root server 2.16.0 or greater)
 		 */
 		crouton_Handlebars.registerHelper('isVirtualOrHybrid', function(data, options) {
-			return (data['venue_type'] === venueType.VIRTUAL || data['venue_type'] === venueType.HYBRID) || inArray(getMasterFormatId('VM', data), getFormats(data))
-				|| inArray(getMasterFormatId('HY', data), getFormats(data)) ? getTrueResult(options, this) : getFalseResult(options, this);
+			return (data['venue_type'] === venueType.VIRTUAL || data['venue_type'] === venueType.HYBRID) || getFormats(data).includes(getMasterFormatId('VM', data))
+				|| getFormats(data).includes(getMasterFormatId('HY', data)) ? getTrueResult(options, this) : getFalseResult(options, this);
 		});
 
 		crouton_Handlebars.registerHelper('hasFormats', function(formats, data, options) {
-			var allFound = false;
-			var formatsResponse = data['formats'].split(",")
-			var formatsParam = formats.split(",");
+			const formatsResponse = data['formats'].split(",")
+			const formatsParam = formats.split(",");
 			for(var i = 0;i < formatsParam.length;i++) {
-				allFound = inArray(formatsParam[i], formatsResponse);
+				if (!formatsResponse.includes(formatsParam[i]))
+					return getFalseResult(options, this);
 			}
-
-			return allFound ? getTrueResult(options, this) : getFalseResult(options, this);
+			return getTrueResult(options, this);
 		});
 		crouton_Handlebars.registerHelper('temporarilyClosed', function(data, options) {
-			if(data['formats_expanded'].getArrayItemByObjectKeyValue('id', getMasterFormatId('TC', data)) !== undefined) {
-				return data['formats_expanded'].getArrayItemByObjectKeyValue('id', getMasterFormatId('TC', data))['description'];
+			const found = data['formats_expanded'].find((format)=>format['id'] === getMasterFormatId('TC', data));
+			if (found !== undefined) {
+				return found['description'];
 			} else {
 				return crouton.localization.getWord("FACILITY IS TEMPORARILY CLOSED");
 			}
 		});
 
 		crouton_Handlebars.registerHelper('meetsVirtually', function(data, options) {
-			if(data['formats_expanded'].getArrayItemByObjectKeyValue('id', getMasterFormatId('VM', data)) !== undefined) {
-				return data['formats_expanded'].getArrayItemByObjectKeyValue('id', getMasterFormatId('VM', data))['description'];
+			const found = data['formats_expanded'].find((format)=>format['id'] === getMasterFormatId('VM', data));
+			if (found !== undefined) {
+				return found['description'];
 			} else {
 				return crouton.localization.getWord("MEETS VIRTUALLY");
 			}
 		});
 
 		crouton_Handlebars.registerHelper('meetsHybrid', function(data, options) {
-			if(data['formats_expanded'].getArrayItemByObjectKeyValue('id', getMasterFormatId('HY', data)) !== undefined) {
-				return data['formats_expanded'].getArrayItemByObjectKeyValue('id', getMasterFormatId('HY', data))['description'];
+			const found = data['formats_expanded'].find((format)=>format['id'] === getMasterFormatId('HY', data));
+			if (found !== undefined) {
+				return found['description'];
 			} else {
 				return crouton.localization.getWord("MEETS VIRTUALLY AND IN PERSON");
 			}
@@ -12815,6 +12905,18 @@ function CroutonHandlebarsExtensions() {
 			return new crouton_Handlebars.SafeString("<a href='tel:" + text + "' target='_blank'>" + text + "</a>");
 		});
 
+		function isFavorite(meeting) {
+			const  localStorageKey = "crouton-favorites";
+			const  favorites = JSON.parse(localStorage.getItem(localStorageKey) || "[]");
+			return favorites.includes(meeting.root_server_uri + "_" + meeting.id_bigint);
+		}
+		crouton_Handlebars.registerHelper('favoriteIcon', function(meeting, options) {
+			return new crouton_Handlebars.SafeString("<span id='crouton-favorite-" + meeting.id_bigint + "' class='crouton-favorite glyphicon glyphicon-heart" + (!isFavorite(meeting) ? "-empty" : "") + "'></span>");
+		});
+
+		crouton_Handlebars.registerHelper('isFavorite', function(meeting, options) {
+			return new crouton_Handlebars.SafeString(isFavorite(meeting) ? 1 : 0);
+		});
 		crouton_Handlebars.registerHelper('ifEquals', function(arg1, arg2, options) {
 			return (arg1 === arg2) ? options.fn(this) : options.inverse(this);
 		});
@@ -12890,8 +12992,31 @@ function CroutonHandlebarsExtensions() {
             	<br/>
         	{{/if}}
 		`);
+		crouton_Handlebars.registerPartial('formatNames', `
+        	{{#each formats_expanded}}
+				<a
+				   class="bmlt-formats btn btn-primary btn-xs"
+				   title=""
+				   data-html="true"
+				   tabindex="0"
+				   data-trigger="focus"
+				   role="button"
+				   data-toggle="popover"
+				   data-original-title=""
+				   data-placement="{{{getWord 'bootstrap-popover-placement'}}}"
+				   data-content="{{description}}">
+                    <span class="glyphicon glyphicon-search"
+						  aria-hidden="true"
+						  data-toggle="popover"
+						  data-trigger="focus"
+						  data-html="true"
+						  role="button"></span>{{ name }}
+				</a>
+			{{/each}}
+			`
+		)
 		crouton_Handlebars.registerPartial('formatKeys', `
-				{{#if this.formats}}
+			{{#if this.formats}}
 				<a
 				   class="bmlt-formats btn btn-primary btn-xs"
 				   title=""
@@ -12913,7 +13038,6 @@ function CroutonHandlebarsExtensions() {
 			{{/if}}
 			`
 		)
-
 		crouton_Handlebars.registerPartial('observerLine', `
 {{#if (hasObserverLine name phone email) }}
 <div class='observerLine'>{{getWord "Contact"}}: {{name}} <a href='tel:{{phone}}'>{{phone}}</a> <a href='mailto:{{email}}'>{{email}}</a></div>
@@ -13344,8 +13468,10 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
     + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"grouping_buttons") : stack1),{"name":"each","hash":{},"fn":container.program(2, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":6,"column":4},"end":{"line":8,"column":13}}})) != null ? stack1 : "")
     + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"formattype_grouping_buttons") : stack1),{"name":"each","hash":{},"fn":container.program(3, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":9,"column":4},"end":{"line":11,"column":13}}})) != null ? stack1 : "")
     + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"map_page") : stack1),{"name":"if","hash":{},"fn":container.program(4, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":12,"column":4},"end":{"line":14,"column":11}}})) != null ? stack1 : "")
-    + "\n"
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,(depth0 != null ? lookupProperty(depth0,"dropdownData") : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":16,"column":4},"end":{"line":25,"column":13}}})) != null ? stack1 : "")
+    + "    <div class=\"bmlt-button-container\"><a id=\"crouton_favorites_button\" tabindex=0 class=\"croutonControlButton btn btn-primary btn-sm\">"
+    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(alias1,"Favorites",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":15,"column":135},"end":{"line":15,"column":158}}}))
+    + "</a></div>\n\n"
+    + ((stack1 = lookupProperty(helpers,"each").call(alias1,(depth0 != null ? lookupProperty(depth0,"dropdownData") : depth0),{"name":"each","hash":{},"fn":container.program(5, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":17,"column":4},"end":{"line":26,"column":13}}})) != null ? stack1 : "")
     + "    </div>\n";
 },"1":function(container,depth0,helpers,partials,data) {
     var lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13370,8 +13496,8 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"field") : depth0), depth0))
     + "\" tabindex=0 data-field=\""
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"title") : depth0), depth0))
-    + "\" class=\"groupingButton groupingButtonLogic btn btn-primary btn-sm\">"
-    + alias2((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"title") : depth0),{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":7,"column":186},"end":{"line":7,"column":208}}}))
+    + "\" class=\"groupingButton croutonControlButton groupingButtonLogic btn btn-primary btn-sm\">"
+    + alias2((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),(depth0 != null ? lookupProperty(depth0,"title") : depth0),{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":7,"column":207},"end":{"line":7,"column":229}}}))
     + "</a></div>\n";
 },"3":function(container,depth0,helpers,partials,data) {
     var alias1=container.lambda, alias2=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13385,7 +13511,7 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"field") : depth0), depth0))
     + "\"tabindex=0 data-field=\""
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"field") : depth0), depth0))
-    + "\" class=\"groupingButton groupingButtonLogic btn btn-primary btn-sm\">"
+    + "\" class=\"groupingButton croutonControlButton groupingButtonLogic btn btn-primary btn-sm\">"
     + alias2(alias1((depth0 != null ? lookupProperty(depth0,"title") : depth0), depth0))
     + "</a></div>\n";
 },"4":function(container,depth0,helpers,partials,data) {
@@ -13396,8 +13522,8 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
         return undefined
     };
 
-  return "        <div class=\"bmlt-button-container\"><a id=\"groupingButton_embeddedMapPage\" tabindex=0 data-field=\"embeddedMapPage\" class=\"groupingButton btn btn-primary btn-sm\">"
-    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"map",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":13,"column":168},"end":{"line":13,"column":185}}}))
+  return "        <div class=\"bmlt-button-container\"><a id=\"groupingButton_embeddedMapPage\" tabindex=0 data-field=\"embeddedMapPage\" class=\"groupingButton croutonControlButton btn btn-primary btn-sm\">"
+    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"map",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":13,"column":189},"end":{"line":13,"column":206}}}))
     + "</a></div>\n";
 },"5":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1, helper, alias1=container.escapeExpression, alias2=depth0 != null ? depth0 : (container.nullContext || {}), alias3=container.hooks.helperMissing, alias4="function", lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13410,17 +13536,17 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
   return "	<div class=\"bmlt-dropdown-container\">\n		<select class=\"crouton-select filter-dropdown\" style=\"width:"
     + alias1(container.lambda(((stack1 = (depths[1] != null ? lookupProperty(depths[1],"config") : depths[1])) != null ? lookupProperty(stack1,"dropdown_width") : stack1), depth0))
     + ";\" data-placeholder=\""
-    + alias1(((helper = (helper = lookupProperty(helpers,"placeholder") || (depth0 != null ? lookupProperty(depth0,"placeholder") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"placeholder","hash":{},"data":data,"loc":{"start":{"line":18,"column":116},"end":{"line":18,"column":131}}}) : helper)))
+    + alias1(((helper = (helper = lookupProperty(helpers,"placeholder") || (depth0 != null ? lookupProperty(depth0,"placeholder") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"placeholder","hash":{},"data":data,"loc":{"start":{"line":19,"column":116},"end":{"line":19,"column":131}}}) : helper)))
     + "\" data-pointer=\""
-    + alias1(((helper = (helper = lookupProperty(helpers,"pointer") || (depth0 != null ? lookupProperty(depth0,"pointer") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"pointer","hash":{},"data":data,"loc":{"start":{"line":18,"column":147},"end":{"line":18,"column":158}}}) : helper)))
+    + alias1(((helper = (helper = lookupProperty(helpers,"pointer") || (depth0 != null ? lookupProperty(depth0,"pointer") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"pointer","hash":{},"data":data,"loc":{"start":{"line":19,"column":147},"end":{"line":19,"column":158}}}) : helper)))
     + "\" id="
-    + alias1(((helper = (helper = lookupProperty(helpers,"elementId") || (depth0 != null ? lookupProperty(depth0,"elementId") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"elementId","hash":{},"data":data,"loc":{"start":{"line":18,"column":163},"end":{"line":18,"column":176}}}) : helper)))
+    + alias1(((helper = (helper = lookupProperty(helpers,"elementId") || (depth0 != null ? lookupProperty(depth0,"elementId") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"elementId","hash":{},"data":data,"loc":{"start":{"line":19,"column":163},"end":{"line":19,"column":176}}}) : helper)))
     + ">\n		    <option value=\"a-\">"
-    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"all",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":19,"column":25},"end":{"line":19,"column":42}}}))
+    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"all",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":20,"column":25},"end":{"line":20,"column":42}}}))
     + " "
-    + alias1(((helper = (helper = lookupProperty(helpers,"placeholder") || (depth0 != null ? lookupProperty(depth0,"placeholder") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"placeholder","hash":{},"data":data,"loc":{"start":{"line":19,"column":43},"end":{"line":19,"column":58}}}) : helper)))
+    + alias1(((helper = (helper = lookupProperty(helpers,"placeholder") || (depth0 != null ? lookupProperty(depth0,"placeholder") : depth0)) != null ? helper : alias3),(typeof helper === alias4 ? helper.call(alias2,{"name":"placeholder","hash":{},"data":data,"loc":{"start":{"line":20,"column":43},"end":{"line":20,"column":58}}}) : helper)))
     + "</option>\n"
-    + ((stack1 = lookupProperty(helpers,"each").call(alias2,(lookupProperty(helpers,"call")||(depth0 && lookupProperty(depth0,"call"))||alias3).call(alias2,(depth0 != null ? lookupProperty(depth0,"uniqueData") : depth0),((stack1 = (depths[1] != null ? lookupProperty(depths[1],"meetings") : depths[1])) != null ? lookupProperty(stack1,"meetingData") : stack1),{"name":"call","hash":{},"data":data,"loc":{"start":{"line":20,"column":14},"end":{"line":20,"column":55}}}),{"name":"each","hash":{},"fn":container.program(6, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":20,"column":6},"end":{"line":22,"column":15}}})) != null ? stack1 : "")
+    + ((stack1 = lookupProperty(helpers,"each").call(alias2,(lookupProperty(helpers,"call")||(depth0 && lookupProperty(depth0,"call"))||alias3).call(alias2,(depth0 != null ? lookupProperty(depth0,"uniqueData") : depth0),((stack1 = (depths[1] != null ? lookupProperty(depths[1],"meetings") : depths[1])) != null ? lookupProperty(stack1,"meetingData") : stack1),{"name":"call","hash":{},"data":data,"loc":{"start":{"line":21,"column":14},"end":{"line":21,"column":55}}}),{"name":"each","hash":{},"fn":container.program(6, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":21,"column":6},"end":{"line":23,"column":15}}})) != null ? stack1 : "")
     + "		</select>\n	</div>\n";
 },"6":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13431,9 +13557,9 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
     };
 
   return "			    <option value=\"a-"
-    + alias3((lookupProperty(helpers,"call")||(depth0 && lookupProperty(depth0,"call"))||alias2).call(alias1,(depths[1] != null ? lookupProperty(depths[1],"objectPointer") : depths[1]),depth0,{"name":"call","hash":{},"data":data,"loc":{"start":{"line":21,"column":24},"end":{"line":21,"column":54}}}))
+    + alias3((lookupProperty(helpers,"call")||(depth0 && lookupProperty(depth0,"call"))||alias2).call(alias1,(depths[1] != null ? lookupProperty(depths[1],"objectPointer") : depths[1]),depth0,{"name":"call","hash":{},"data":data,"loc":{"start":{"line":22,"column":24},"end":{"line":22,"column":54}}}))
     + "\">"
-    + alias3((lookupProperty(helpers,"call")||(depth0 && lookupProperty(depth0,"call"))||alias2).call(alias1,(depths[1] != null ? lookupProperty(depths[1],"optionName") : depths[1]),depth0,{"name":"call","hash":{},"data":data,"loc":{"start":{"line":21,"column":56},"end":{"line":21,"column":83}}}))
+    + alias3((lookupProperty(helpers,"call")||(depth0 && lookupProperty(depth0,"call"))||alias2).call(alias1,(depths[1] != null ? lookupProperty(depths[1],"optionName") : depths[1]),depth0,{"name":"call","hash":{},"data":data,"loc":{"start":{"line":22,"column":56},"end":{"line":22,"column":83}}}))
     + "</option>\n";
 },"7":function(container,depth0,helpers,partials,data) {
     var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13443,9 +13569,9 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
         return undefined
     };
 
-  return ((stack1 = (lookupProperty(helpers,"ifEquals")||(depth0 && lookupProperty(depth0,"ifEquals"))||container.hooks.helperMissing).call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"view_by") : stack1),"weekdays",{"name":"ifEquals","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(9, data, 0),"data":data,"loc":{"start":{"line":30,"column":4},"end":{"line":34,"column":17}}})) != null ? stack1 : "")
+  return ((stack1 = (lookupProperty(helpers,"ifEquals")||(depth0 && lookupProperty(depth0,"ifEquals"))||container.hooks.helperMissing).call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"view_by") : stack1),"weekdays",{"name":"ifEquals","hash":{},"fn":container.program(8, data, 0),"inverse":container.program(9, data, 0),"data":data,"loc":{"start":{"line":31,"column":4},"end":{"line":35,"column":17}}})) != null ? stack1 : "")
     + "        <ul class=\"nav nav-tabs\">\n"
-    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"day_sequence") : stack1),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":36,"column":12},"end":{"line":38,"column":21}}})) != null ? stack1 : "")
+    + ((stack1 = lookupProperty(helpers,"each").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"day_sequence") : stack1),{"name":"each","hash":{},"fn":container.program(10, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":37,"column":12},"end":{"line":39,"column":21}}})) != null ? stack1 : "")
     + "        </ul>\n    </div>\n";
 },"8":function(container,depth0,helpers,partials,data) {
     var lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13456,7 +13582,7 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
     };
 
   return "        <div class=\"bmlt-page "
-    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":31,"column":30},"end":{"line":31,"column":57}}}))
+    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":32,"column":30},"end":{"line":32,"column":57}}}))
     + " show\" id=\"nav-days\">\n";
 },"9":function(container,depth0,helpers,partials,data) {
     var lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13467,7 +13593,7 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
     };
 
   return "        <div class=\"bmlt-page "
-    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":33,"column":30},"end":{"line":33,"column":57}}}))
+    + container.escapeExpression((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),"css-direction",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":34,"column":30},"end":{"line":34,"column":57}}}))
     + " hide\" id=\"nav-days\">\n";
 },"10":function(container,depth0,helpers,partials,data) {
     var alias1=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13480,7 +13606,7 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
   return "                <li><a href=\"#tab"
     + alias1(container.lambda(depth0, depth0))
     + "\" data-toggle=\"tab\">"
-    + alias1((lookupProperty(helpers,"getDayOfTheWeek")||(depth0 && lookupProperty(depth0,"getDayOfTheWeek"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"getDayOfTheWeek","hash":{},"data":data,"loc":{"start":{"line":37,"column":61},"end":{"line":37,"column":85}}}))
+    + alias1((lookupProperty(helpers,"getDayOfTheWeek")||(depth0 && lookupProperty(depth0,"getDayOfTheWeek"))||container.hooks.helperMissing).call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"getDayOfTheWeek","hash":{},"data":data,"loc":{"start":{"line":38,"column":61},"end":{"line":38,"column":85}}}))
     + "</a></li>\n";
 },"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data,blockParams,depths) {
     var stack1, alias1=depth0 != null ? depth0 : (container.nullContext || {}), lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13492,10 +13618,38 @@ this["hbs_Crouton"]["templates"]["header"] = Handlebars.template({"0":function(c
 
   return container.escapeExpression((lookupProperty(helpers,"startup")||(depth0 && lookupProperty(depth0,"startup"))||container.hooks.helperMissing).call(alias1,depth0,{"name":"startup","hash":{},"data":data,"loc":{"start":{"line":1,"column":0},"end":{"line":1,"column":16}}}))
     + "\n"
-    + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"header") : stack1),{"name":"if","hash":{},"fn":container.program(0, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":2,"column":0},"end":{"line":27,"column":7}}})) != null ? stack1 : "")
+    + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"header") : stack1),{"name":"if","hash":{},"fn":container.program(0, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":2,"column":0},"end":{"line":28,"column":7}}})) != null ? stack1 : "")
     + "\n"
-    + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"has_tabs") : stack1),{"name":"if","hash":{},"fn":container.program(7, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":29,"column":0},"end":{"line":41,"column":7}}})) != null ? stack1 : "");
+    + ((stack1 = lookupProperty(helpers,"if").call(alias1,((stack1 = (depth0 != null ? lookupProperty(depth0,"config") : depth0)) != null ? lookupProperty(stack1,"has_tabs") : stack1),{"name":"if","hash":{},"fn":container.program(7, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":30,"column":0},"end":{"line":42,"column":7}}})) != null ? stack1 : "");
 },"useData":true,"useDepths":true});
+this["hbs_Crouton"]["templates"]["locationSearch"] = Handlebars.template({"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
+    var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
+        if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
+          return parent[propertyName];
+        }
+        return undefined
+    };
+
+  return "<button id=\"location-search-button\" style=\"width: auto\" class=\"location-search-button\" title=\""
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Open Location Search Dialog",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":1,"column":94},"end":{"line":1,"column":135}}}))
+    + "\">\n    <span class=\"location-search-button-label\" style=\"position:initial;\">\n        "
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search by location",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":3,"column":8},"end":{"line":3,"column":40}}}))
+    + "\n        <svg xmlns=\"http://www.w3.org/2000/svg\" width=\"16\" height=\"16\" fill=\"currentColor\" class=\"bi bi-crosshair\" viewBox=\"0 0 16 16\" style=\"vertical-align: sub;\">\n            <path d=\"M8.5.5a.5.5 0 0 0-1 0v.518A7 7 0 0 0 1.018 7.5H.5a.5.5 0 0 0 0 1h.518A7 7 0 0 0 7.5 14.982v.518a.5.5 0 0 0 1 0v-.518A7 7 0 0 0 14.982 8.5h.518a.5.5 0 0 0 0-1h-.518A7 7 0 0 0 8.5 1.018zm-6.48 7A6 6 0 0 1 7.5 2.02v.48a.5.5 0 0 0 1 0v-.48a6 6 0 0 1 5.48 5.48h-.48a.5.5 0 0 0 0 1h.48a6 6 0 0 1-5.48 5.48v-.48a.5.5 0 0 0-1 0v.48A6 6 0 0 1 2.02 8.5h.48a.5.5 0 0 0 0-1zM8 10a2 2 0 1 0 0-4 2 2 0 0 0 0 4\"/>\n        </svg>\n    </span>\n</button>\n<div id=\"bmlt_location_search_modal\" class=\"modal\" style=\"display: none;\">\n    <div id=\"bmlt_location_search_content\" class=\"modal-content\" style=\"border-color:unset;\">\n        <span id=\"close_location_search\" class=\"modal-close\">x</span>\n        <div class=\"modal-title\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search by location",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":12,"column":33},"end":{"line":12,"column":65}}}))
+    + "</div>\n        <div class=\"crouton-modal-search-page\">\n            <div id=\"modal-location-search-box\" class=\"modal-search\">\n                <input id=\"bmlt-location-search-goto-text\" type=\"text\" class=\"crouton-goto-text\"\n                    placeholder=\""
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Enter a city or zip code",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":16,"column":33},"end":{"line":16,"column":71}}}))
+    + "\">\n                <button id=\"bmlt-location-search-text-button\" class=\"filter-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"text_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":17,"column":84},"end":{"line":17,"column":109}}}))
+    + "</button>\n            </div>\n            <div class=\"modal-search\">\n                <button id=\"bmlt-location-search-nearbyMeetings\" class=\"filter-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"near_me",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":20,"column":87},"end":{"line":20,"column":108}}}))
+    + "</button>\n            </div>\n            <div id=\"location-search-widen\" class=\"modal-search\">\n                <button id=\"bmlt-location-search-widen\" class=\"filter-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Widen Search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":23,"column":78},"end":{"line":23,"column":104}}}))
+    + "</button>\n            </div>\n            <div>\n			    <!--<button id=\"location-search-close\" class=\"advanced-search-button\" style=\"float:left\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Close",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":26,"column":96},"end":{"line":26,"column":115}}}))
+    + "</a>-->\n                <button id=\"bmlt-location_search-cancel\" class=\"advanced-search-button\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Cancel Search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":27,"column":88},"end":{"line":27,"column":115}}}))
+    + "</button>\n		    </div>\n        </div>\n        <div class=\"crouton-modal-search-choice\"></div>\n    </div>\n</div>";
+},"useData":true});
 this["hbs_Crouton"]["templates"]["main"] = Handlebars.template({"0":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
         if (Object.prototype.hasOwnProperty.call(parent, propertyName)) {
@@ -13692,11 +13846,11 @@ this["hbs_Crouton"]["templates"]["mapMenu"] = Handlebars.template({"0":function(
     + ((stack1 = lookupProperty(helpers,"each").call(alias2,((stack1 = (depth0 != null ? lookupProperty(depth0,"meetings") : depth0)) != null ? lookupProperty(stack1,"bydays") : stack1),{"name":"each","hash":{},"fn":container.program(4, data, 0, blockParams, depths),"inverse":container.noop,"data":data,"loc":{"start":{"line":36,"column":8},"end":{"line":38,"column":17}}})) != null ? stack1 : "")
     + "        </table>\n    </div>\n</div>\n<div id=\"geocoding_modal\" class=\"modal\" style=\"display: none;\">\n	<div id=\"search_content\" class=\"modal-content\">\n		<span class=\"modal-title\">"
     + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"Show meetings near...",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":44,"column":28},"end":{"line":44,"column":63}}}))
-    + "</span><span id=\"close_search\" class=\"modal-close\">x</span>\n        <p></p>\n        <div class=\"modal-search\">\n            "
-    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"Enter a city or zip code",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":47,"column":12},"end":{"line":47,"column":50}}}))
-    + "\n            <input id=\"goto-text\" type=\"text\">\n            <button id=\"goto-button\" class=\"filter-button\">"
-    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"go",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":49,"column":59},"end":{"line":49,"column":75}}}))
-    + "</button>\n        </div>\n  	</div>\n</div>\n\n";
+    + "</span><span id=\"close_search\" class=\"modal-close\">x</span>\n        <p></p>\n        <div class=\"crouton-modal-search-page\">\n            <div class=\"modal-search\">\n                "
+    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"Enter a city or zip code",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":48,"column":16},"end":{"line":48,"column":54}}}))
+    + "\n                <input id=\"goto-text\" class=\"crouton-goto-text\" type=\"text\">\n                <button id=\"goto-button\" class=\"filter-button\">"
+    + alias1((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias3).call(alias2,"text_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":50,"column":63},"end":{"line":50,"column":88}}}))
+    + "</button>\n            </div>\n        </div>\n        <div class=\"crouton-modal-search-choice\"></div>\n  	</div>\n</div>\n\n";
 },"usePartial":true,"useData":true,"useDepths":true});
 this["hbs_Crouton"]["templates"]["mapSearch"] = Handlebars.template({"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
     var alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -13710,13 +13864,13 @@ this["hbs_Crouton"]["templates"]["mapSearch"] = Handlebars.template({"compiler":
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Open Search Dialog",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":1,"column":58},"end":{"line":1,"column":90}}}))
     + "\">\n    <span class=\"menu-button-label\" style=\"position:initial;\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search for meetings",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":2,"column":62},"end":{"line":2,"column":95}}}))
-    + "</span>\n</button>\n<div id=\"bmltsearch_modal\" class=\"modal\" style=\"display: none;\">\n    <div id=\"bmltsearch_content\" class=\"modal-content\">\n        <span id=\"close_search\" class=\"modal-close\">x</span>\n        <div id=\"modal-search-page\">\n            <div class=\"modal-title\">"
+    + "</span>\n</button>\n<div id=\"bmltsearch_modal\" class=\"modal\" style=\"display: none;\">\n    <div id=\"bmltsearch_content\" class=\"modal-content\">\n        <span id=\"close_search\" class=\"modal-close\">x</span>\n        <div class=\"crouton-modal-search-page\">\n            <div class=\"modal-title\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Search for meetings",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":8,"column":37},"end":{"line":8,"column":70}}}))
     + "</div>\n            <div id=\"zoomed-out-message\" class=\"hide\">\n                <p>"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"zoomed-out-message",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":10,"column":19},"end":{"line":10,"column":51}}}))
     + "</p>\n            </div>\n            <div id=\"modal-search-box\" class=\"modal-search\">\n                <input id=\"bmltsearch-goto-text\" type=\"text\"\n                    placeholder=\""
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Enter a city or zip code",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":14,"column":33},"end":{"line":14,"column":71}}}))
-    + "\" style=\"margin-bottom:5px;\">\n                <button id=\"bmltsearch-text-button\" class=\"filter-button\">"
+    + "\" class=\"crouton-goto-text\">\n                <button id=\"bmltsearch-text-button\" class=\"filter-button\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"text_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":15,"column":74},"end":{"line":15,"column":99}}}))
     + "</button>\n            </div>\n            <div class=\"modal-search\">\n                <button id=\"bmltsearch-nearbyMeetings\" class=\"filter-button\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"near_me",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":18,"column":77},"end":{"line":18,"column":98}}}))
@@ -13724,14 +13878,14 @@ this["hbs_Crouton"]["templates"]["mapSearch"] = Handlebars.template({"compiler":
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"click_search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":21,"column":74},"end":{"line":21,"column":100}}}))
     + "</button>\n            </div>\n            <button id=\"show-search-parameters\" class=\"advanced-search-button\">"
     + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Adjust Search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":23,"column":79},"end":{"line":23,"column":106}}}))
-    + "</button>\n        </div>\n        <div id=\"modal-seach-parameters\">\n            <div class=\"modal-title\">"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Adjust Search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":26,"column":37},"end":{"line":26,"column":64}}}))
+    + "</button>\n        </div>\n        <div class=\"crouton-modal-search-choice\"></div>\n        <div id=\"modal-seach-parameters\">\n            <div class=\"modal-title\">"
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Adjust Search",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":27,"column":37},"end":{"line":27,"column":64}}}))
     + "</div>\n            <input type=\"number\" id=\"search_parameter\" name=\"search_parameter\" maxlength=\"3\" size=\"3\">\n            <p>"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"This number represents",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":28,"column":15},"end":{"line":28,"column":51}}}))
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"This number represents",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":29,"column":15},"end":{"line":29,"column":51}}}))
     + ":</p>\n            <input type=\"radio\" id=\"search_radius\" name=\"map_search_type\" value=\"radius\">\n            <label id=\"search_radius_label\" for=\"search_radius\"></label><br>\n            <input type=\"radio\" id=\"search_count\" name=\"map_search_type\" value=\"count\">\n            <label for=\"search_count\">"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Approx. number of meetings in result",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":32,"column":38},"end":{"line":32,"column":88}}}))
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Approx. number of meetings in result",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":33,"column":38},"end":{"line":33,"column":88}}}))
     + "</label><br>\n            <button id=\"show-search-page\" class=\"advanced-search-button\">"
-    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Back",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":33,"column":73},"end":{"line":33,"column":91}}}))
+    + alias3((lookupProperty(helpers,"getWord")||(depth0 && lookupProperty(depth0,"getWord"))||alias2).call(alias1,"Back",{"name":"getWord","hash":{},"data":data,"loc":{"start":{"line":34,"column":73},"end":{"line":34,"column":91}}}))
     + "</button>\n        </div>\n    </div>\n</div>";
 },"useData":true});
 this["hbs_Crouton"]["templates"]["meeting3ColumnRow"] = Handlebars.template({"0":function(container,depth0,helpers,partials,data) {
@@ -14038,7 +14192,9 @@ this["hbs_Crouton"]["templates"]["tableRows"] = Handlebars.template({"0":functio
     + alias3((lookupProperty(helpers,"formatDataFromArray")||(depth0 && lookupProperty(depth0,"formatDataFromArray"))||alias2).call(alias1,(depth0 != null ? lookupProperty(depth0,"venue_type_name") : depth0),{"name":"formatDataFromArray","hash":{},"data":data,"loc":{"start":{"line":15,"column":15},"end":{"line":15,"column":59}}}))
     + "\"\n		data-weekdays=\""
     + alias3((lookupProperty(helpers,"formatDataPointer")||(depth0 && lookupProperty(depth0,"formatDataPointer"))||alias2).call(alias1,(depth0 != null ? lookupProperty(depth0,"formatted_day") : depth0),{"name":"formatDataPointer","hash":{},"data":data,"loc":{"start":{"line":16,"column":17},"end":{"line":16,"column":57}}}))
-    + "\">\n"
+    + "\"\n		data-favorite="
+    + alias3((lookupProperty(helpers,"isFavorite")||(depth0 && lookupProperty(depth0,"isFavorite"))||alias2).call(alias1,depth0,{"name":"isFavorite","hash":{},"data":data,"loc":{"start":{"line":17,"column":16},"end":{"line":17,"column":35}}}))
+    + ">\n"
     + ((stack1 = container.invokePartial(lookupProperty(partials,"tableDataRow"),depth0,{"name":"tableDataRow","data":data,"indent":"\t\t","helpers":helpers,"partials":partials,"decorators":container.decorators})) != null ? stack1 : "")
     + "	</tr>\n";
 },"compiler":[8,">= 4.3.0"],"main":function(container,depth0,helpers,partials,data) {
@@ -14049,7 +14205,7 @@ this["hbs_Crouton"]["templates"]["tableRows"] = Handlebars.template({"0":functio
         return undefined
     };
 
-  return ((stack1 = lookupProperty(helpers,"each").call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"each","hash":{},"fn":container.program(0, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":1,"column":0},"end":{"line":19,"column":9}}})) != null ? stack1 : "");
+  return ((stack1 = lookupProperty(helpers,"each").call(depth0 != null ? depth0 : (container.nullContext || {}),depth0,{"name":"each","hash":{},"fn":container.program(0, data, 0),"inverse":container.noop,"data":data,"loc":{"start":{"line":1,"column":0},"end":{"line":20,"column":9}}})) != null ? stack1 : "");
 },"usePartial":true,"useData":true});
 this["hbs_Crouton"]["templates"]["weekdays"] = Handlebars.template({"0":function(container,depth0,helpers,partials,data) {
     var stack1, helper, alias1=depth0 != null ? depth0 : (container.nullContext || {}), alias2=container.hooks.helperMissing, alias3=container.escapeExpression, lookupProperty = container.lookupProperty || function(parent, propertyName) {
@@ -14175,13 +14331,16 @@ var croutonDefaultTemplates = {
 	</div>
 	`,
 	meeting_times_template: `
-		<div class="bmlt-day">{{this.formatted_day}}</div>
+		<div class="bmlt-meeting-day-favorite">
+			<div class="bmlt-day">{{this.formatted_day}}</div>
+			<div class="favorite-icon">{{favoriteIcon this}}</div>
+		</div>
 		{{#ifEquals this.duration_time "24:00:00"}}
 			<div class="bmlt-time-2">{{this.start_time_formatted}}</div>
 		{{else}}
 			<div class="bmlt-time-2">{{this.start_time_formatted}} - {{this.end_time_formatted}}</div>
 		{{/ifEquals}}
-		{{> formatKeys }}
+		{{> (format_list_style) }}
 		<div class="bmlt-comments">{{formatLink this.formatted_comments}}</div>
 		<div class="bmlt-observer">{{> (selectObserver) }}</div>
 	`,
@@ -15277,16 +15436,20 @@ crouton_Handlebars.registerHelper("log", (x) => console.log(x));
 crouton_Handlebars.registerHelper('selectFormatPopup', () => "formatPopup");
 crouton_Handlebars.registerHelper('selectObserver', () => "observerTemplate");
 
-
+/**
+ * There must be exactly one crouton instance per page.
+ * @param {*} config
+ */
 function Crouton(config) {
-	var self = this;
-	self.mutex = false;
+	const self = this;
+	self.ready = false;
 	self.filtering = false;
 	self.masterFormatCodes = [];
 	self.currentView = "weekday";
 	self.distanceTabAllowed = false;
+	self.favoritesOn = false;
 	self.config = {
-		version: '4.1.12',             // CroutonJS version for debugging
+		version: '4.3.1',             // CroutonJS version for debugging
 		on_complete: null,            // Javascript function to callback when data querying is completed.
 		root_server: null,			  // The root server to use.
 		placeholder_id: "bmlt-tabs",  // The DOM id that will be used for rendering
@@ -15321,6 +15484,8 @@ function Crouton(config) {
 		has_languages: false,		  // Shows the language dropdown
 		has_common_needs: false, 	  // Shows the Common Needs dropdown
 		has_venues: true,		      // Shows the venue types dropdown
+		has_favorites: false,		  // Shows the favorites button
+		has_geolocation: false,		  // Shows the geolocation button in the table header
 		has_meeting_count: false,	  // Shows the meeting count
 		recurse_service_bodies: false,// Recurses service bodies when making service bodies request
 		service_body: [],             // Array of service bodies to return data for.
@@ -15363,7 +15528,6 @@ function Crouton(config) {
 		tileUrl: 'https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png',
 		tileOptions: {
 			attribution: 'Map data &copy; <a href="https://www.openstreetmap.org/">OpenStreetMap</a> contributors, <a href="https://creativecommons.org/licenses/by-sa/2.0/">CC-BY-SA</a>',
-			maxZoom: 18
 		},
 		minZoom: 6,
 		maxZoom: 17,
@@ -15373,9 +15537,41 @@ function Crouton(config) {
 		caption: false,
 		groups: false,
 		details_table: false,
+		focusedMeetingPopupZoomLevel: 14,
 	};
 
 	self.setConfig(config);
+	const body = jQuery("body");
+	if (self.config['theme'] !== '') {
+		body.append("<div id='custom-css'><link rel='stylesheet' type='text/css' href='" + self.config['template_path'] + '/themes/' + self.config['theme'] + ".css'>");
+	}
+	if (self.config['custom_css'] !== '') {
+		body.append("<div id='custom-css'><style type='text/css'>" + self.config['custom_css'] + "</style></div>");
+	}
+	self.isIOSDevice = function() {
+    	if (navigator.userAgentData && navigator.userAgentData.platform) {
+        	if (navigator.userAgentData.platform === 'iOS') {
+            	return true;
+        	}
+    	}
+    	const userAgent = navigator.userAgent || navigator.vendor || window.opera;
+    	const isIOS = /iPad|iPhone|iPod/.test(userAgent) && !window.MSStream;
+    	const isIPadOS = navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && !window.MSStream;
+    	return isIOS || isIPadOS;
+	}
+
+	self.isAndroidDevice = function() {
+    	return /Android/i.test(navigator.userAgent);
+	}
+	self.deviceType = self.isIOSDevice() ? 'ios' : (self.isAndroidDevice() ? 'android' : 'desktop');
+
+	/**
+	 * Do the lookups for the [crouton_map] shortcode
+	 * @param float latitude
+	 * @param float longitude
+	 * @param float width search width that will be sent to the server
+	 * @param boolean fitBounds
+	 */
 	Crouton.prototype.searchByCoordinates = function(latitude, longitude, width, fitBounds=true) {
 		const original_query = self.config['custom_query'];
 		self.config['custom_query'] = (self.config['custom_query'] !== null ? self.config['custom_query'] : "")
@@ -15384,20 +15580,23 @@ function Crouton(config) {
 		self.meetingSearch(function() {
 				self.config.refresh_map=1;
 				self.config.show_map = 1;
-				self.reset();
+				jQuery("#" + self.config["placeholder_id"]).html("");
 				self.render(false, fitBounds);
 		});
 		self.config['custom_query'] = original_query;
 	};
 
+	/**
+	 * Get the meeting list for the [bmlt_tab] shortcode.
+	 * @param string url
+	 * @param function cb
+	 * @returns Promise that returns when the server query finishes.
+	 */
 	self.getMeetings = function(url,cb=null) {
-		var promises = [fetchJsonp(this.config['root_server'] + url).then(function(response) { return response.json(); })];
+		const promises = [fetchJsonp(this.config['root_server'] + url).then(function(response) { return response.json(); })];
 
 		if (self.config['extra_meetings'].length > 0) {
-			var extra_meetings_query = "";
-			for (var i = 0; i < self.config['extra_meetings'].length; i++) {
-				extra_meetings_query += "&meeting_ids[]=" + self.config["extra_meetings"][i];
-			}
+			const extra_meetings_query = self.config['extra_meetings'].reduce((query,item) => query + "&meeting_ids[]=" + item, '');
 			const regex = /&services\[\]=\d+/;
 			url = url.replace(regex, '');
 			promises.push(fetchJsonp(self.config['root_server'] + url + extra_meetings_query).then(function (response) { return response.json(); }));
@@ -15405,38 +15604,34 @@ function Crouton(config) {
 
 		return Promise.all(promises)
 			.then(function(data) {
-				var mainMeetings = data[0];
-				var extraMeetings;
-				var jsonMeetings = JSON.stringify(mainMeetings['meetings']);
-				if (data.length === 2) {
-					extraMeetings = data[1];
-				}
-				if (jsonMeetings === "{}" || jsonMeetings === "[]") {
-					var fullUrl = self.config['root_server'] + url
+				const mainMeetings = data[0];
+				if (mainMeetings['meetings'].length === 0) {
+					const fullUrl = self.config['root_server'] + url
 					console.log("Could not find any meetings for the criteria specified with the query <a href=\"" + fullUrl + "\" target=_blank>" + fullUrl + "</a>");
 					jQuery('#' + self.config['placeholder_id']).html("No meetings found.");
 					self.meetingData = [];
 					self.formatsData = [];
-					self.mutex = false;
 					cb && cb();
+					self.fireReady();
 					return;
 				}
+				// TODO: is this necessary? why not just add this to the query?
 				if (self.config['exclude_zip_codes'].length > 0) {
-					mainMeetings['meetings'] = mainMeetings['meetings'].filter(function(m) { return !inArray(m['location_postal_code_1'], self.config['exclude_zip_codes']); } );
+					mainMeetings['meetings'] = mainMeetings['meetings'].filter(function(m) { return !self.config['exclude_zip_codes'].includes(m['location_postal_code_1']); } );
 				}
 				self.meetingData = mainMeetings['meetings'];
 				self.formatsData = mainMeetings['formats'];
-				if (extraMeetings) {
-					self.meetingData = self.meetingData.concat(extraMeetings['meetings']);
+				// extra meetings
+				if (data.length === 2) {
+					self.meetingData = self.meetingData.concat(data[1]['meetings']);
 				}
 				cb && cb();
-				self.mutex = false;
+				self.fireReady();
 			});
 	};
-	self.mutex = true;
 
 	self.meetingSearch = function(cb=null) {
-		var url = '/client_interface/jsonp/?switcher=GetSearchResults&get_used_formats&lang_enum=' + self.config['short_language'];
+		let url = '/client_interface/jsonp/?switcher=GetSearchResults&get_used_formats&lang_enum=' + self.config['short_language'];
 
 		if (self.config['formats']) {
 			url += self.config['formats'].reduce(function(prev,id) {
@@ -15465,9 +15660,7 @@ function Crouton(config) {
 			url += self.config['custom_query'] + '&sort_keys='  + self.config['sort_keys'];
 			return self.getMeetings(url,cb);
 		} else if (self.config['service_body'].length > 0) {
-			for (var i = 0; i < self.config['service_body'].length; i++) {
-				url += '&services[]=' + self.config['service_body'][i];
-			}
+			url = self.config['service_body'].reduce((curr,item)=>curr+'&services[]='+item, url);
 
 			if (self.config['recurse_service_bodies']) {
 				url += '&recursive=1';
@@ -15480,31 +15673,47 @@ function Crouton(config) {
 			return new Promise(function(resolve, reject) {
 				self.meetingData = [];
 				self.formatsData = [];
-				self.mutex = false;
 				resolve([]);
+				self.fireReady();
 			});
 		}
+	}
+	self.readyListener = [];
+	/**
+	 * Add a listener for the event that the crouton instance has loaded its data and we can now go ahead and execute the shortcodes.
+	 * Generally, each listener corresponds to different shortcode.  The main ones go over the render method, but there are also listeners
+	 * for [meeting_count] etc.
+	 * @param function callback
+	 */
+	self.listenForReady = function(callback) {
+		if (self.ready) callback();
+		else self.readyListener.push(callback);
 	};
-
-	self.lock = function(callback) {
-		var self = this;
-		var lock_id = setInterval(function() {
-			if (!self.mutex) {
-				clearInterval(lock_id);
-				callback();
-			}
-		}, 100);
+	/**
+	 * FIres the event that crouton is loaded and ready.
+	 */
+	self.fireReady = function() {
+		self.ready = true;
+		self.readyListener.forEach(function(callback) {
+			callback();
+		});
+		self.readyListener = [];
 	};
-
-	self.dayTab = function(day_id) {
+	/**
+	 * Bring up the appropriate tab based on the meeting id.
+	 * This is only used when a meeting is selected in the msp.  I consider this bloat, it is superceded by the meeting details popup available in the marker text.
+	 * @param string id meeting id.
+	 */
+	self.dayTabFromId = function(id) {
+		const day_id = self.meetingData.find((m)=>m.id_bigint == id).weekday_tinyint;
 		self.hideAllPages();
 		jQuery('.nav-tabs a[href="#tab' + day_id + '"]').tab('show');
 		jQuery("#" + day_id).removeClass("hide").addClass("show");
 	};
-	self.dayTabFromId = function(id) {
-		day_id = self.meetingData.find((m)=>m.id_bigint == id).weekday_tinyint;
-		self.dayTab(day_id);
-	};
+	/**
+	 * Show a page from the table (weekday, distance, city...)
+	 * @param string id selector, id attribute of the HtML
+	 */
 	self.showPage = function (id) {
 		jQuery(id+" .bmlt-data-row-placeholder").each(function() {
 			const meetingId = this.dataset.meetingid;
@@ -15517,7 +15726,11 @@ function Crouton(config) {
 		self.addStripes();
 		jQuery(id).removeClass("hide").addClass("show");
 	};
-
+	/**
+	 * Bring up a view.
+	 * @param string viewName abstract viewname (weekday, distance, city...)
+	 * @param int showingNow number of items currently being displayed on the page
+	 */
 	self.showView = function (viewName, showingNow=0) {
 		if (viewName === 'distance' && !self.distanceTabAllowed) {
 			viewName = self.config.groups ? 'city' : 'day';
@@ -15578,6 +15791,7 @@ function Crouton(config) {
 			self.dayView();
 			return;
 		}
+		self.currentView = field;
 		self.lowlightButton("#day");
 		self.lowlightButton(".groupingButton");
 		self.highlightButton("#groupingButton_" + field);
@@ -15620,8 +15834,12 @@ function Crouton(config) {
 			jQuery(value).addClass((index % 2) ? 'oddRow' : 'evenRow');
 		});
 	}
+	/**
+	 *
+	 * @returns a list of the IDs of meetings matching the current filters.
+	 */
 	self.calcShowingNow = function() {
-		var showingNow = [];
+		let showingNow = [];
 		jQuery(".bmlt-data-row:not(.hide)").each(function (index, value) {
 			const rowId = value.id.split("-");
 			showingNow.push(rowId[rowId.length-1]);
@@ -15644,26 +15862,13 @@ function Crouton(config) {
 			}
 		});
 		this.addStripes();
-		var showingNow = this.calcShowingNow();
+		const showingNow = this.calcShowingNow();
 		self.updateMeetingCount(showingNow);
-		self.updateFilters();
-		if (croutonMap) croutonMap.fillMap(showingNow);
-		self.showView(self.currentView, showingNow.length);
+		self.updateFilters(showingNow);
+		if (croutonMap) croutonMap.setFilteredIds(showingNow);
+		if (self.currentView !== 'map') self.showView(self.currentView, showingNow.length);
 	};
-	self.resetFilter = function () {
-		croutonMap.filterVisible(false);
-		if ((self.config.map_page && self.filtering) || self.config.show_map) croutonMap.fillMap();
-		self.filtering = false;
-		self.updateFilters();
-		self.updateMeetingCount();
-		jQuery(".filter-dropdown").val(null).trigger("change");
-		jQuery(".group-header").removeClass("hide");
-		jQuery(".meeting-group").removeClass("hide");
-		jQuery(".bmlt-data-row").removeClass("hide");
-		jQuery(".evenRow").removeClass("evenRow");
-		jQuery(".oddRow").removeClass("oddRow");
-	};
-	self.updateFilters = function() {
+	self.updateFilters = function(showingNow) {
 		if (!self.dropdownData) return;
 		const getId = function (row) {return row.id.replace("meeting-data-row-", "")};
 		// The options available for this filter have to take into account all other filters, but ignore the
@@ -15686,6 +15891,12 @@ function Crouton(config) {
 			let showing = self.meetingData.filter((m) => !(hidden.includes(m.id_bigint)));
 			dropdown.optionsShowing = dropdown.uniqueData(showing).map((o) => dropdown.optionName(o));
 		});
+		const favoritesDropdown = self.dropdownData.find((d) => d.elementId === "filter-dropdown-favorites");
+		if (!favoritesDropdown || !self.shouldOfferFavorites(showingNow)) {
+			jQuery("#crouton_favorites_button").addClass("hide");
+		} else {
+			jQuery("#crouton_favorites_button").removeClass("hide");
+		}
 	}
 	self.renderStandaloneMap = function (selector, context, callback=null, fitBounds=true) {
 		hbs_Crouton['localization'] = self.localization;
@@ -15693,40 +15904,14 @@ function Crouton(config) {
 		self.setUpPartials();
 		croutonMap.initialize(self.createBmltMapElement(),self.meetingData,context,null,fitBounds,callback,self.config['noMap']);
 	}
-	self.retrieveGeolocation = function() {
-		return new Promise((resolve, reject) => {
-			if (window.storedGeolocation) {
-				resolve(window.storedGeolocation);
-			} else if (navigator.geolocation) {
-				navigator.geolocation.getCurrentPosition((position) => {
-					window.storedGeolocation = {
-						latitude: position.coords.latitude,
-						longitude: position.coords.longitude
-					};
-					resolve(window.storedGeolocation);
-				}, (error) => {
-					reject(new Error('Error getting geolocation: ' + error.message));
-				});
-			} else {
-				reject(new Error('Geolocation is not supported by this browser.'));
-			}
-		});
-	};
-	self.getCurrentLocation = function(callback) {
-		self.gretrieveGeolocation().then(position => {
-			callback(position);
-		}).catch(error => {
-			jQuery('.geo').removeClass("hide").addClass("show").html(`<p>${error.message}</p>`);
-		});
-	};
 	self.renderView = function (selector, context, callback, fitBounds) {
 		hbs_Crouton['localization'] = self.localization;
-		var template = hbs_Crouton.templates['main'];
+		const template = hbs_Crouton.templates['main'];
 		jQuery(selector).html(template(context));
 		callback();
 	};
 	self.updateMeetingCount = function(showingNow=null) {
-		var self = this;
+		const self = this;
 		let meetingCount = self.meetingData.length;
 		if (self.meetingCountCallback) self.meetingCountCallback(meetingCount);
 		if (self.groupCountCallback) self.groupCountCallback(
@@ -15739,8 +15924,8 @@ function Crouton(config) {
 		}
 		self.showingNowCount = meetingCount;
 		jQuery(".crouton_root_service_body").each(function() {
-			var text = "";
-			var field = 'name';
+			let text = "";
+			let field = 'name';
 			if (this.dataset.field) field = this.dataset.field;
 			if (self.config['service_body'].length > 0) {
 				const sb = self.getServiceBodyDetails(self.config['service_body'][0]);
@@ -15750,19 +15935,17 @@ function Crouton(config) {
 		});
 		jQuery(addLive('#bmlt_tabs_meeting_count')).text(meetingCount);
 		jQuery(addLive('#bmlt_tabs_group_count')).each(function(){
-			var filteredMeetings = self.meetingData;
-			if (showingNow!==null) filteredMeetings = self.meetingData.filter((m) => showingNow.includes(m.id_bigint));
+			const filteredMeetings = (showingNow!==null) ? self.meetingData.filter((m) => showingNow.includes(m.id_bigint)) : self.meetingData;
 			const groups = self.config.groups ? filteredMeetings : self.convertToGroups([...filteredMeetings]);
-			jQuery(this).text(arrayUnique(groups).length);
+			jQuery(this).text([...new Set(groups)].length);
 		});
 		jQuery(addLive('#bmlt_tabs_service_body_names')).each(function() {
-			var filteredMeetings = self.meetingData;
-			if (showingNow!==null) filteredMeetings = self.meetingData.filter((m) => showingNow.includes(m.id_bigint));
-			var ids = getUniqueValuesOfKey(filteredMeetings, 'service_body_bigint');
-			var me = this;
+			const filteredMeetings = (showingNow!==null) ? self.meetingData.filter((m) => showingNow.includes(m.id_bigint)) : self.meetingData;
+			const ids = getUniqueValuesOfKey(filteredMeetings, 'service_body_bigint');
+			const me = this;
 			self.getServiceBodies(ids, false).then(function (service_bodies) {
-				var n = service_bodies.length;
-				var names = service_bodies.map((m)=>m['name']);
+				const n = service_bodies.length;
+				const names = service_bodies.map((m)=>m['name']);
 				names.sort();
 				var ret = "";
 				if (n===1) {
@@ -15781,16 +15964,23 @@ function Crouton(config) {
 		});
 	}
 	self.getServiceBodies = function(service_bodies_id, requires_parents=true) {
-		var url = this.config['root_server'] + '/client_interface/jsonp/?switcher=GetServiceBodies'
-			+ (requires_parents ? '&parents=1' : '') + getServiceBodiesQueryString(service_bodies_id);
+		const url = this.config['root_server'] + '/client_interface/jsonp/?switcher=GetServiceBodies'
+			+ (requires_parents ? '&parents=1' : '') + self.getServiceBodiesQueryString(service_bodies_id);
 		return fetchJsonp(url)
 			.then(function(response) {
 				return response.json();
 			});
 	};
 
+	self.getServiceBodiesQueryString = function(service_bodies_id) {
+		let service_bodies_query = "";
+		for (var x = 0; x < service_bodies_id.length; x++) {
+			service_bodies_query += "&services[]=" + service_bodies_id[x];
+		}
+		return service_bodies_query;
+	}
 	self.getMasterFormats = function() {
-		var url = this.config['root_server'] + '/client_interface/jsonp/?switcher=GetFormats&lang_enum=en&key_strings[]=TC&key_strings[]=VM&key_strings[]=HY';
+		const url = this.config['root_server'] + '/client_interface/jsonp/?switcher=GetFormats&lang_enum=en&key_strings[]=TC&key_strings[]=VM&key_strings[]=HY';
 		return fetchJsonp(url)
 			.then(function(response) {
 				return response.json();
@@ -15812,16 +16002,16 @@ function Crouton(config) {
 			self.handlebarMapOptions.lng = parseFloat(meetingDetailsData.longitude);
 			return "<div id='bmlt-handlebars-map' class='bmlt-map'></div>"
 		});
-		var parser = new DOMParser();
+		const parser = new DOMParser();
 
 		while (elements.length > 0) {
-			var element = elements.item(0);
+			const element = elements.item(0);
 			if (!element.firstChild) {
 				console.log('<bmlt-handlebar> tag must have at least one child');
 				element.remove();
 				continue;
 			}
-			var templateString = '';
+			let templateString = '';
 			if (element.firstChild.nodeType === 1) {
 				if (!element.firstChild.firstChild || element.firstChild.firstChild.nodeType !== 3) {
 					console.log('<bmlt-handlebar> tag: cannot find textnode');
@@ -15834,13 +16024,13 @@ function Crouton(config) {
 			}
 			var handlebarResult;
 			try {
-				var template = crouton_Handlebars.compile(templateString);
+				const template = crouton_Handlebars.compile(templateString);
 				handlebarResult = template(meetingDetailsData);
 			} catch (e) {
 				console.log(e);
 				handlebarResult = e.message;
 			}
-			var htmlDecode = parser.parseFromString('<body>'+handlebarResult+'</body>', "text/html");
+			const htmlDecode = parser.parseFromString('<body>'+handlebarResult+'</body>', "text/html");
 			if (!htmlDecode.body || !htmlDecode.body.firstChild) {
 				console.log('<bmlt-handlebar> tag: could not parse the Handlebars result');
 				element.replaceWith('<bmlt-handlebar> tag: could not parse the Handlebars result');
@@ -15912,7 +16102,12 @@ function Crouton(config) {
 		n = n.replace(/PM|pm/g, x => ampm['PM']);
 		return n;
 	}
-	self.enrichMeetings = function (meetingData) {
+	/**
+	 * Take raw meeting data as returned from server adding values that should be conveniently displayed.
+	 * @param array meetingData
+	 * @returns the array with enriched data
+	 */
+	self.enrichMeetings = function(meetingData) {
 		var meetings = [];
 
 		let queryStringChar = '?';
@@ -15943,8 +16138,8 @@ function Crouton(config) {
 			meetingData[m]['day_of_the_week'] = meetingData[m]['start_time_raw'].isoWeekday() === 7 ? 1 : meetingData[m]['start_time_raw'].isoWeekday() + 1;
 			meetingData[m]['formatted_day'] = self.localization.getDayOfTheWeekWord(meetingData[m]['day_of_the_week']);
 
-			var formats = meetingData[m]['formats'].split(",");
-			var formats_expanded = [];
+			const formats = meetingData[m]['formats'].split(",");
+			const formats_expanded = [];
 			let formatRootServer = self.formatsData.filter((f)=>f['root_server_uri'] == meetingData[m]['root_server_uri']);
 			meetingData[m]['wheelchair'] = false;
 			for (var f = 0; f < formats.length; f++) {
@@ -15966,14 +16161,13 @@ function Crouton(config) {
 
 			meetingData[m]['venue_type'] = parseInt(meetingData[m]['venue_type']);
 			meetingData[m]['venue_type_name'] = getVenueTypeName(meetingData[m]);
-			meetingData[m]['formats_expanded'] = formats_expanded;
-			var addressParts = [
+			meetingData[m]['formats_expanded'] = formats_expanded.sortByKey('name');
+			const addressParts = [
 				meetingData[m]['location_street'],
 				meetingData[m]['location_municipality'].trim(),
 				meetingData[m]['location_province'].trim(),
 				meetingData[m]['location_postal_code_1'].trim()
-			];
-			addressParts.clean();
+			].filter((value)=>value!=="");
 			meetingData[m]['formatted_address'] = addressParts.join(", ");
 			meetingData[m]['formatted_location_info'] =
 				meetingData[m]['location_info'] != null
@@ -15992,7 +16186,7 @@ function Crouton(config) {
 				}
 			}
 
-			var serviceBodyInfo = self.getServiceBodyDetails(meetingData[m]['service_body_bigint'])
+			const serviceBodyInfo = self.getServiceBodyDetails(meetingData[m]['service_body_bigint'])
 			meetingData[m]['serviceBodyUrl'] = serviceBodyInfo["url"];
 			meetingData[m]['serviceBodyPhone'] = serviceBodyInfo["helpline"];
 			meetingData[m]['serviceBodyName'] = serviceBodyInfo["name"];
@@ -16000,7 +16194,7 @@ function Crouton(config) {
 			meetingData[m]['serviceBodyContactEmail'] = serviceBodyInfo["contact_email"];
 			meetingData[m]['serviceBodyType'] = self.localization.getServiceBodyType(serviceBodyInfo["type"]);
 
-			var parentBodyInfo = self.getServiceBodyDetails(serviceBodyInfo["parent_id"]);
+			const parentBodyInfo = self.getServiceBodyDetails(serviceBodyInfo["parent_id"]);
 			if (parentBodyInfo !== undefined) {
 				meetingData[m]['parentServiceBodyId'] = serviceBodyInfo["parent_id"];
 				meetingData[m]['parentServiceBodyUrl'] = parentBodyInfo["url"];
@@ -16029,7 +16223,27 @@ function Crouton(config) {
 			return self.convertToGroups(meetings);
 		}
 		return meetings;
-	};
+	}
+	// [deprecated] Retire after root server 2.16.4 is rolled out everywhere.
+	const masterFormatVenueType = {
+		IN_PERSON: "IN_PERSON",
+		VIRTUAL: "VIRTUAL",
+	}
+
+	function getVenueTypeName(data) {
+		if (data['venue_type'] === venueType.HYBRID || getFormats(data).includes(getMasterFormatId('HY', data))) {
+			return [crouton.localization.getVenueType(masterFormatVenueType.VIRTUAL), crouton.localization.getVenueType(masterFormatVenueType.IN_PERSON)];
+		} else if (data['venue_type'] === venueType.VIRTUAL || getFormats(data).includes(getMasterFormatId('VM', data))) {
+			return [crouton.localization.getVenueType(masterFormatVenueType.VIRTUAL)];
+		} else {
+			return [crouton.localization.getVenueType(masterFormatVenueType.IN_PERSON)];
+		}
+	}
+	/**
+	 * Convert from individual meetings to groups.
+	 * @param array meetings
+	 * @returns
+	 */
 	self.convertToGroups = function(meetings) {
 		if (!meetings || !meetings.length) return [];
 		if (meetings[0].hasOwnProperty('membersOfGroup')) return meetings;
@@ -16076,6 +16290,11 @@ function Crouton(config) {
 		});
 		return groups;
 	}
+	/**
+	 * Update the distances displyed after geocoding or geolocation.
+	 * @param boolean initial
+	 * @returns
+	 */
 	Crouton.prototype.updateDistances = function(initial=false) {
 		const self = this;
 		var knt = 0;
@@ -16110,8 +16329,8 @@ function Crouton(config) {
 			});
 		}
 		const sorted = parent.children().sort(function (a, b) {
-			const idA =parseFloat( jQuery(a).data('meetingid').replace("meeting-data-row-", ""));
-			const idB =parseFloat( jQuery(b).data('meetingid').replace("meeting-data-row-", ""));
+			const idA =parseFloat( (jQuery(a).data('meetingid') ?? jQuery(a).attr('id')).replace("meeting-data-row-", ""));
+			const idB =parseFloat( (jQuery(b).data('meetingid') ?? jQuery(b).attr('id')).replace("meeting-data-row-", ""));
 			const dataA = self.meetingData.find((m) => m.id_bigint==idA);
 			const dataB = self.meetingData.find((m) => m.id_bigint==idB);
 			const distanceA = dataA ? parseFloat(dataA['distance_in_km']) : Number.POSITIVE_INFINITY;
@@ -16143,8 +16362,6 @@ function Crouton(config) {
 				? "<td>{{> meetingStackedRow}}</td>"
 				: hbs_Crouton.templates['meeting3ColumnRow'])
 			);
-
-
 			self.registerPartial("meetingDataTemplate", self.config['meeting_data_template']);
 			self.registerPartial("meetingDataTemplate", self.config['meeting_data_template']);
 			self.registerPartial("metaDataTemplate", self.config['metadata_template']);
@@ -16162,6 +16379,14 @@ function Crouton(config) {
 			handlebarsExtensions.registerHelpers();
 			handlebarsExtensions.registerPartials(self.config.groups);
 	}
+	self.getServiceBodyDetails = function(serviceBodyId) {
+		return this.all_service_bodies.find((s)=>s['id'] === serviceBodyId)
+	}
+	/**
+	 * Calculate the distances sfter geocoding or geolocation, adding them to the meeting data.
+	 * @param boolean initial
+	 * @returns
+	 */
 	self.calculateDistance = function(meetingData) {
 		meetingData['distance'] = '';
 		if (meetingData['venue_type'] != 2) {
@@ -16205,19 +16430,21 @@ function Crouton(config) {
 	self.getUsedNext24 = function(meetings) {
 		return [{name: 'Next24', value: 1}];
 	}
-	self.isEmpty = function(obj) {
-		for (var key in obj) {
-			if(obj.hasOwnProperty(key))
-				return false;
-		}
-		return true;
-	};
+	self.getUsedFavorites = function(meetings) {
+		return [{name: 'Favorite', value: 1}]
+	}
 	self.createBmltMapElement = function() {
 		if (!document.getElementById('bmlt-map')) {
 			jQuery("#bmlt-tabs").before("<div id='bmlt-map' class='bootstrap-bmlt bmlt-map "+self.localization.getWord('css-direction')+" bmlt_map_container_div'></div>");
 		}
 		return 'bmlt-map';
 	}
+	self.createLocationSearchElement = function() {
+		if (!document.getElementById('bmlt-location-search')) {
+			jQuery("#bmlt-header").append("<div id='bmlt-location-search' class='bootstrap-bmlt bmlt-location-search "+self.localization.getWord('css-direction')+" bmlt_location_search_container_div'></div>");
+		}
+		return 'bmlt-location-search';
+	}
 	if (typeof window.croutonMap === 'undefined') {
 		window.croutonMap = new MeetingMap(self.config);
 		if (self.config['map_search']) self.searchMap();
@@ -16227,7 +16454,7 @@ function Crouton(config) {
 }
 
 Crouton.prototype.setConfig = function(config) {
-	var self = this;
+	const self = this;
 	const deprecatedNames = {
 		button_filters: 'grouping_buttons',
 		button_format_filters: 'formattype_grouping_buttons',
@@ -16288,43 +16515,27 @@ Crouton.prototype.setConfig = function(config) {
 			console.log("Error parsing custom translations: " + e.message);
 		}
 	}
-};
-
-Crouton.prototype.reset = function() {
-	var self = this;
-	jQuery("#custom-css").remove();
-	jQuery("#" + self.config["placeholder_id"]).html("");
-};
-
-Crouton.prototype.doFilters = function() {
-	return this.filterMeetingsFromView();
-}
-Crouton.prototype.getServiceBodyDetails = function(serviceBodyId) {
-	var self = this;
-	for (var s = 0; s < self.all_service_bodies.length; s++) {
-		var service_body = self.all_service_bodies[s];
-		if (service_body['id'] === serviceBodyId) {
-			return service_body;
-		}
-	}
+	if (self.config.format_list_style !== 'formatNames') self.config.format_list_style = 'formatKeys';
 }
-
+/**
+ * This supports the [bmlt_handlebars] shortcode, which allows a meeting's details to be inserted into a page.
+ */
 Crouton.prototype.doHandlebars = function() {
 	var elements = document.getElementsByTagName('bmlt-handlebar');
 	if (elements.length === 0) {
 		console.log('No <bmlt-handlebar> tags found');
 		return;
 	};
-	var self = this;
-	self.lock(function() {
-		if (self.isEmpty(self.meetingData)) {
+	const self = this;
+	self.listenForReady(function() {
+		if (!self.meetingData || self.meetingData.length === 0) {
 			for (let i = 0; i < elements.length; i++) {
 				var element = elements.item(i);
 				element.innerHTML = "Meeting not found!";
 			}
 			return;
 		}
-		var promises = [self.getServiceBodies([self.meetingData[0]['service_body_bigint']])];
+		const promises = [self.getServiceBodies([self.meetingData[0]['service_body_bigint']])];
 		Promise.all(promises)
 			.then(function(data) {
 				hbs_Crouton['localization'] = self.localization;
@@ -16345,10 +16556,21 @@ Crouton.prototype.doHandlebars = function() {
 			});
 	});
 };
-
+/**
+ * Sometimes the logic in the map has to decide whether to let the map implementation (google or leaflet) do something, or just do the calculation
+ * itself.  So we have to ask crouton if the map is showing or not.
+ * @returns boolean
+ */
+Crouton.prototype.isEmbeddedMapShowing = function() {
+	if (this.config['show_map']) return true;
+	const embeddedMap = document.getElementById("byfield_embeddedMapPage");
+	if (embeddedMap) {
+		return !embeddedMap.classList.contains('hide');
+	}
+	return true;
+}
 Crouton.prototype.meetingModal = function(meetingId) {
-	let self = this;
-	this.openMeetingModal(self.meetingData.find((m) => m.id_bigint == meetingId));
+	this.openMeetingModal(this.meetingData.find((m) => m.id_bigint == meetingId));
 	return;
 }
 Crouton.prototype.openMeetingModal = function(meeting) {
@@ -16369,7 +16591,7 @@ Crouton.prototype.openMeetingModal = function(meeting) {
 	croutonMap.loadPopupMap("bmlt-handlebars-map", meeting, {
 		lat: parseFloat(meeting.latitude),
 		lng: parseFloat(meeting.longitude),
-		zoom: 14
+		zoom: self.config.focusedMeetingPopupZoomLevel ?? 14
 	});
 	let visibleMeetings = jQuery('.bmlt-data-row:visible');
 	let index = -1;
@@ -16410,8 +16632,11 @@ Crouton.prototype.openMeetingModal = function(meeting) {
 		mm.getElementsByClassName('modal-right').item(0).addEventListener("click", ev=>doSwipe("left"));
 	}
 }
+/**
+ * Execute the [crouton_map] shortcode.
+ */
 Crouton.prototype.searchMap = function() {
-	var self = this;
+	const self = this;
 	self.distanceTabAllowed = true;
 	if (!self.config.map_search || typeof self.config.map_search !== 'object') {
 		self.config.map_search = {
@@ -16429,12 +16654,6 @@ Crouton.prototype.searchMap = function() {
 	}
 	self.config['map_page'] = false;
 	self.config['show_map'] = false;
-	var body = jQuery("body");
-	if (self.config['theme'] !== '') {
-		body.append("<div id='custom-css'><link rel='stylesheet' type='text/css' href='" + self.config['template_path'] + '/themes/' + self.config['theme'] + ".css'>");
-	}
-
-	body.append("<div id='custom-css'><style type='text/css'>" + self.config['custom_css'] + "</style></div>");
 
 	self.meetingData = null;
 	self.renderStandaloneMap("#" + self.config['placeholder_id'], {
@@ -16451,28 +16670,26 @@ Crouton.prototype.searchMap = function() {
 		"location": {'latitude':0,'longitude':0,'zoom':10}  // TODO: Where is this used?
 	});
 }
+/**
+ * This methods does the main work of creating the crouton table.
+ * @param boolean doMeetingMap MeetingMap is the old name for the [bmlt_map] shortcode.
+ * @param boolean fitBounds Expand the scaale and center of the map to contain all meetings.
+ */
 Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
-	var self = this;
-
-	self.lock(function() {
-		var body = jQuery("body");
-		if (self.config['theme'] !== '') {
-			body.append("<div id='custom-css'><link rel='stylesheet' type='text/css' href='" + self.config['template_path'] + '/themes/' + self.config['theme'] + ".css'>");
-		}
-
-		body.append("<div id='custom-css'><style type='text/css'>" + self.config['custom_css'] + "</style></div>");
+	const self = this;
 
-		if (self.isEmpty(self.meetingData)) {
+	self.listenForReady(function() {
+		if (!self.meetingData || self.meetingData.length === 0) {
 			jQuery('#please-wait').remove();
 			self.showMessage("No meetings found for parameters specified.");
 			if (self.config['refresh_map']) {
-				croutonMap.refreshMeetings(self.meetingData, fitBounds, true);
+				croutonMap.refreshMeetings(self.meetingData, fitBounds);
 			}
 			return;
 		}
 
 		self.unique_service_bodies_ids = getUniqueValuesOfKey(self.meetingData, 'service_body_bigint').sort();
-		var promises = [self.getMasterFormats(), self.getServiceBodies(self.unique_service_bodies_ids)];
+		const promises = [self.getMasterFormats(), self.getServiceBodies(self.unique_service_bodies_ids)];
 		Promise.all(promises)
 			.then(function(data) {
 				self.all_service_bodies = [];
@@ -16509,7 +16726,7 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 				var weekdaysData = [];
 				while (day_counter < 7) {
 					var day = self.config.day_sequence[day_counter];
-					var daysOfTheWeekMeetings = enrichedMeetingData.filterByObjectKeyValue('day_of_the_week', day);
+					var daysOfTheWeekMeetings = enrichedMeetingData.filter((meeting)=>meeting['day_of_the_week'] == day);
 					weekdaysData.push({
 						"day": day,
 						"meetings": daysOfTheWeekMeetings
@@ -16525,7 +16742,7 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 						if (groupByName.startsWith('distance')) continue;
 						var groupByData = getUniqueValuesOfKey(daysOfTheWeekMeetings, groupByName).sort();
 						for (var i = 0; i < groupByData.length; i++) {
-							var groupByMeetings = daysOfTheWeekMeetings.filterByObjectKeyValue(groupByName, groupByData[i]);
+							var groupByMeetings = daysOfTheWeekMeetings.filter((meeting)=>meeting[groupByName] == groupByData[i]);
 							if (groupingButtonsData.hasOwnProperty(groupByName) && groupingButtonsData[groupByName].hasOwnProperty(groupByData[i])) {
 								groupingButtonsData[groupByName][groupByData[i]] = groupingButtonsData[groupByName][groupByData[i]].concat(groupByMeetings);
 							} else if (groupingButtonsData.hasOwnProperty(groupByName)) {
@@ -16600,7 +16817,7 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 				self.dropdownData = [];
 				if (self.config.has_days) self.dropdownData.push(
 					{placeholder: self.localization.getWord('weekday'), pointer: 'weekdays', elementId: "filter-dropdown-weekdays",
-					 uniqueData: (meetings) => sortListByList(getUniqueValuesOfKey(meetings, "formatted_day"), self.dayNamesSequenced),
+					 uniqueData: (meetings) => self.sortListByList(getUniqueValuesOfKey(meetings, "formatted_day"), self.dayNamesSequenced),
 					 objectPointer: convertToPunyCode, optionName: (s)=>s});
 				if (self.config.has_states) self.dropdownData.push(
 					{placeholder: self.localization.getWord('states'), pointer: 'States', elementId: "filter-dropdown-states",
@@ -16662,6 +16879,10 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 					{placeholder: '', pointer: 'next24', elementId: "filter-dropdown-next24",
 						uniqueData: (meetings) => self.getUsedNext24(meetings),
 						objectPointer: (s)=>s.value, optionName: (s)=>s.name});
+				if (self.config.has_favorites)  self.dropdownData.push(
+					{placeholder: '', pointer: 'favorite', elementId: "filter-dropdown-favorites",
+						uniqueData: (meetings) => self.getUsedFavorites(meetings),
+						objectPointer: (s)=>s.value, optionName: (s)=>s.name});
 				let renderer = doMeetingMap ? self.renderStandaloneMap : self.renderView;
 				renderer("#" + self.config['placeholder_id'], {
 					"config": self.config,
@@ -16680,20 +16901,30 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 						jQuery('#groupingButton_distance_in_km').addClass('hide');
 					}
 					self.addStripes();
-					self.calcShowingNow()
+					const showingNow = self.calcShowingNow();
 					self.updateMeetingCount();
 					jQuery('#please-wait').remove();
 					if (self.config['map_search'] != null || self.config['show_map']) {
 						jQuery(".bmlt-data-row").css({cursor: "pointer"});
 						jQuery(".bmlt-data-row").click(function (e) {
-							if (e.target.tagName !== 'A')
+							if (e.target.tagName !== 'A' && !e.target.id.startsWith('crouton-favorite-')) {
 								croutonMap.rowClick(parseInt(this.id.replace("meeting-data-row-", "")));
+							}
 						});
 					}
 
 					jQuery("#" + self.config['placeholder_id']).addClass("bootstrap-bmlt");
 					jQuery("#filter-dropdown-visibile").removeClass("crouton-select").addClass("hide");
+					jQuery("#filter-dropdown-visibile").parent().addClass("hide");
 					jQuery("#filter-dropdown-next24").removeClass("crouton-select").addClass("hide");
+					jQuery("#filter-dropdown-next24").parent().addClass("hide");
+					jQuery("#filter-dropdown-favorites").removeClass("crouton-select").addClass("hide");
+					jQuery("#filter-dropdown-favorites").parent().addClass("hide");
+					if (self.shouldOfferFavorites(showingNow)) {
+						jQuery("#crouton_favorites_button").removeClass("hide");
+					} else {
+						jQuery("#crouton_favorites_button").addClass("hide");
+					}
 					jQuery(".crouton-select").select2({
 						dropdownAutoWidth: true,
 						allowClear: false,
@@ -16730,6 +16961,57 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 					jQuery('.filter-dropdown').on('select2:select', function (e) {
 						self.filterMeetingsFromView();
 					});
+					jQuery('#crouton_favorites_button').on('click', function (e) {
+						if (self.favoritesOn) {
+							self.favoritesOn = false;
+							jQuery("#filter-dropdown-favorites").val("a-");
+							self.lowlightButton("#crouton_favorites_button");
+						} else {
+							self.favoritesOn = true;
+							jQuery("#filter-dropdown-favorites").val("a-1");
+							self.highlightButton("#crouton_favorites_button");
+						}
+						self.filterMeetingsFromView();
+						return;
+					});
+					if (!self.config['has_favorites'] || !self.config['header']) {
+						jQuery(".favorite-icon").addClass("hide");
+					}
+					jQuery(document).on('click', '.crouton-favorite', function(e) {
+						e.preventDefault();
+						e.stopPropagation();
+						const meetingId = parseInt(this.id.replace("crouton-favorite-", ""));
+						const  localStorageKey = "crouton-favorites";
+						const  favorites = JSON.parse(localStorage.getItem(localStorageKey) || "[]");
+						const  index = favorites.indexOf(self.config.root_server + "_" + meetingId);
+						const  row = e.target.closest(".bmlt-data-row");
+						let shouldFilterMeetings = self.favoritesOn;
+						const showingNow = self.calcShowingNow();
+						const favoritesButtonHidden = jQuery("#crouton_favorites_button").hasClass("hide");
+						if (index !== -1) {
+							favorites.splice(index, 1);
+							e.target.classList.remove("glyphicon-heart");
+							e.target.classList.add("glyphicon-heart-empty");
+							row.setAttribute("data-favorite", 0);
+						} else {
+							shouldFilterMeetings = favoritesButtonHidden;
+							favorites.push(self.config.root_server + "_" + meetingId);
+							e.target.classList.remove("glyphicon-heart-empty");
+							e.target.classList.add("glyphicon-heart");
+							row.setAttribute("data-favorite", 1);
+						}
+						localStorage.setItem(localStorageKey, JSON.stringify(favorites));
+						if (!self.shouldOfferFavorites(showingNow)) {
+							shouldFilterMeetings = true;
+							self.favoritesOn = false;
+							jQuery("#filter-dropdown-favorites").val("a-");
+							self.lowlightButton("#crouton_favorites_button");
+							jQuery("#crouton_favorites_button").addClass("hide");
+						}
+						if (shouldFilterMeetings) {
+							self.filterMeetingsFromView();
+						}
+					});
 
 					jQuery("#day").on('click', function () {
 						self.showView('day');
@@ -16755,8 +17037,8 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 							jQuery(this).tab('show');
 						});
 
-						var d = new Date();
-						var n = d.getDay();
+						const d = new Date();
+						let n = d.getDay();
 						n++;
 						jQuery('.nav-tabs a[href="#tab' + n + '"]').tab('show');
 						jQuery('#tab' + n).show();
@@ -16778,27 +17060,46 @@ Crouton.prototype.render = function(doMeetingMap = false, fitBounds=true) {
 						if (self.meetingData.filter(m => m.venue_type != 2).length==0) {
 							jQuery('#groupingButton_embeddedMapPage').addClass('hide');
 						}
-						else croutonMap.initialize('byfield_embeddedMapPage', self.meetingData, null, null, fitBoundsInitial);
+						else {
+							croutonMap.initialize('byfield_embeddedMapPage', self.meetingData, null, null, fitBoundsInitial);
+							if (self.config['has_geolocation'] && self.config['header']) jQuery('#'+self.createLocationSearchElement()).append(croutonMap.createLocationSearchButton());
+						}
 					}
 					if (self.config['refresh_map']) {
-						croutonMap.refreshMeetings(self.meetingData, fitBounds, true);
+						croutonMap.refreshMeetings(self.meetingData, fitBounds);
 					}
 					if (self.config['view_by'] == 'map' && !self.config['map_page'])
 						self.config['view_by'] = 'day';
 						self.showView(self.config['view_by'], self.meetingData.length);
-					if (self.config['on_complete'] != null && isFunction(self.config['on_complete'])) {
+					if (self.config['on_complete'] != null && {}.toString.call(self.config['on_complete']) === '[object Function]') {
 						self.config['on_complete']();
 					}
 				}, !doMeetingMap || (!self.config['lat'] && !self.config['lng']));
 			});
 		});
-	Crouton.prototype.forceShowMap = function() {
-		if (this.config.map_page && jQuery('#byfield_embeddedMapPage').hasClass('hide')) {
-			this.mapView();
+	self.shouldOfferFavorites = function(showingNow) {
+		if (!self.config['has_favorites']) return false;
+		const  localStorageKey = "crouton-favorites";
+		const  favorites = JSON.parse(localStorage.getItem(localStorageKey) || "[]");
+		for (let i = 0; i < favorites.length; i++) {
+			const split = favorites[i].split("_");
+			const  meetingId = split[split.length-1];
+			if (showingNow.includes(meetingId)) return true;
+		}
+		return false;
+	}
+	self.sortListByList = function(source, truth) {
+		var goal = [];
+		for (var x = 0; x < truth.length; x++) {
+			for (var y = 0; y < source.length; y++) {
+				if (truth[x] === source[y]) {
+					goal.push(source[y])
+				}
+			}
 		}
+		return goal;
 	}
 };
-
 // [deprecated] Retire after root server 2.16.4 is rolled out everywhere.
 function getMasterFormatId(code, data) {
 	for (var f = 0; f < crouton.masterFormatCodes.length; f++) {
@@ -16809,28 +17110,6 @@ function getMasterFormatId(code, data) {
 	}
 }
 
-// [deprecated] Retire after root server 2.16.4 is rolled out everywhere.
-var masterFormatVenueType = {
-	IN_PERSON: "IN_PERSON",
-	VIRTUAL: "VIRTUAL",
-}
-
-var venueType = {
-	IN_PERSON: 1,
-	VIRTUAL: 2,
-	HYBRID: 3,
-}
-
-function getVenueTypeName(data) {
-	if (data['venue_type'] === venueType.HYBRID || inArray(getMasterFormatId('HY', data), getFormats(data))) {
-		return [crouton.localization.getVenueType(masterFormatVenueType.VIRTUAL), crouton.localization.getVenueType(masterFormatVenueType.IN_PERSON)];
-	} else if (data['venue_type'] === venueType.VIRTUAL || inArray(getMasterFormatId('VM', data), getFormats(data))) {
-		return [crouton.localization.getVenueType(masterFormatVenueType.VIRTUAL)];
-	} else {
-		return [crouton.localization.getVenueType(masterFormatVenueType.IN_PERSON)];
-	}
-}
-
 // TODO: Change this logic when https://github.com/bmlt-enabled/bmlt-root-server/issues/353 is released and rolled out everywhere.
 function getFormats(data) {
 	return data['formats'] !== "" ? data['format_shared_id_list'].split(",") : [];
@@ -16846,17 +17125,6 @@ function getUniqueValuesOfKey(array, key){
 		return carry;
 	}, []);
 }
-
-function getValuesFromObject(o) {
-	var arr = [];
-	for (key in o) {
-		if (o.hasOwnProperty(key)) {
-			arr.push(o[key]);
-		}
-	}
-
-	return arr;
-}
 function getUniqueFormats(array){
 	return array.reduce(function(carry, val){
 		if (!(val.formats_expanded)) return carry;
@@ -16874,13 +17142,13 @@ function getUniqueFormatsOfType(array, type){
 	},[]).sortByKey('name');
 }
 Crouton.prototype.renderMeetingCount = function() {
-	var self = this;
-	self.lock(function() {
+	const self = this;
+	self.listenForReady(function() {
 		self.updateMeetingCount()
 	});
 }
 Crouton.prototype.simulateFilterDropdown = function() {
-	self = this;
+	const self = this;
 	jQuery('.bmlt-page:not(#byfield_embeddedMapPage)').each(function () {
 		self.hidePage(this);
 	});
@@ -16919,76 +17187,12 @@ Crouton.prototype.getAdjustedDateTime = function(meeting_day, meeting_time, meet
 
 	return meeting_date_time_obj;
 };
-
-function arrayUnique(a, b, c) {
-	b = a.length;
-	while (c = --b)
-		while (c--) a[b] !== a[c] || a.splice(c, 1);
-	return a
-}
-
-function sortListByList(source, truth) {
-	var goal = [];
-	for (var x = 0; x < truth.length; x++) {
-		for (var y = 0; y < source.length; y++) {
-			if (truth[x] === source[y]) {
-				goal.push(source[y])
-			}
-		}
-	}
-
-	return goal;
-}
-
-function inArray(needle, haystack) {
-	return haystack.indexOf(needle) !== -1;
-}
-
-function isFunction(functionToCheck) {
-	return functionToCheck && {}.toString.call(functionToCheck) === '[object Function]';
-}
-
-function getServiceBodiesQueryString(service_bodies_id) {
-	var service_bodies_query = "";
-	for (var x = 0; x < service_bodies_id.length; x++) {
-		service_bodies_query += "&services[]=" + service_bodies_id[x];
-	}
-	return service_bodies_query;
-}
-
-Array.prototype.clone = function() {
-	return this.slice();
+// TODO: why can't this be a const?  If I set it to const, then I get an error from bootstrap???!!!!
+var venueType = {
+	IN_PERSON: 1,
+	VIRTUAL: 2,
+	HYBRID: 3,
 }
-
-Array.prototype.filterByObjectKeyValue = function(key, value) {
-	var ret = [];
-	for (var i = 0; i < this.length; i++) {
-		if (this[i][key] === value) {
-			ret.push(this[i])
-		}
-	}
-
-	return ret;
-};
-
-Array.prototype.getArrayItemByObjectKeyValue = function(key, value) {
-	for (var i = 0; i < this.length; i++) {
-		if (this[i][key] === value) {
-			return this[i];
-		}
-	}
-};
-
-Array.prototype.clean = function() {
-	for (var i = 0; i < this.length; i++) {
-		if (this[i] === "") {
-			this.splice(i, 1);
-			i--;
-		}
-	}
-	return this;
-};
-
 Array.prototype.sortByKey = function (key) {
 	this.sort(function (a, b) {
 		if (a[key] < b[key])
@@ -17032,21 +17236,14 @@ function swipedetect(el, callback){
     }, false)
 }
 function isIOSDevice() {
-    if (navigator.userAgentData && navigator.userAgentData.platform) {
-        if (navigator.userAgentData.platform === 'iOS') {
-            return true;
-        }
-    }
-    const userAgent = navigator.userAgent || navigator.vendor || window.opera;
-    const isIOS = /iPad|iPhone|iPod/.test(userAgent) && !window.MSStream;
-    const isIPadOS = navigator.platform === 'MacIntel' && navigator.maxTouchPoints > 1 && !window.MSStream;
-    return isIOS || isIPadOS;
+    return crouton.deviceType === "ios";
 }
 
 function isAndroidDevice() {
-    return /Android/i.test(navigator.userAgent);
+    return crouton.deviceType === "android";
 }
 
+
 function isMobileDevice() {
     return isIOSDevice() || isAndroidDevice() || /Mobi|Android/i.test(navigator.userAgent);
 }
@@ -17146,8 +17343,10 @@ function openDirectionsModal(e) {
 
 function closeDirectionsModal() {
 		const modal = document.getElementById('directionsMapModal');
-		modal.style.display = 'none';
-		if (modal.className.includes('remove-after-use')) modal.remove();
+		if (modal) {
+			modal.style.display = 'none';
+			if (modal.className.includes('remove-after-use')) modal.remove();
+		}
 }
 
 function openDirections(url, latitude, longitude, fromModal = true) {
@@ -17170,33 +17369,31 @@ function MeetingMap(inConfig) {
 	const config = inConfig;
 	if (!config.maxZoom) config.maxZoom = 17;
 	if (!config.minZoom) config.minZoom = 6;
+	if (!config.locationSearchZoom) config.locationSearchZoom = 12; // TODO: for now, not in interface.  Experience will show if it is worth adding to UI.
 	if (!config.marker_contents_template) config.marker_contents_template = croutonDefaultTemplates.marker_contents_template;
 	var gAllMeetings = [];
 	var gMeetingIdsFromCrouton = null;
 	var gSearchPoint = false;
-	var loadedCallbackFunction = null;
-	var loadedCallbackArgs = [];
-	var oldBounds = false;
-	var isMouseDown = false;
+	var gLoadedCallbackFunction = null;
+	var gLoadedCallbackArgs = [];
+	var gOldBounds = false;
+	var gCurrentlyDraggingMap = false;
+	var gLocationSearchResult = null;
 	function preloadApiLoadedCallback(f,a) {
-		loadedCallbackFunction = f;
-		loadedCallbackArgs = a;
+		gLoadedCallbackFunction = f;
+		gLoadedCallbackArgs = a;
 	}
 	function apiLoadedCallback() {
-		loadedCallbackFunction(...loadedCallbackArgs);
+		gLoadedCallbackFunction(...gLoadedCallbackArgs);
 	}
-
 	function retrieveGeolocation() {
 		return new Promise((resolve, reject) => {
-			if (window.storedGeolocation) {
-				resolve(window.storedGeolocation);
-			} else if (navigator.geolocation) {
+			if (navigator.geolocation) {
 				navigator.geolocation.getCurrentPosition((position) => {
-					window.storedGeolocation = {
-						latitude: position.coords.latitude,
-						longitude: position.coords.longitude
-					};
-					resolve(window.storedGeolocation);
+					resolve({
+						lat: position.coords.latitude,
+						lng: position.coords.longitude
+					});
 				}, (error) => {
 					reject(new Error('Error getting geolocation: ' + error.message));
 				});
@@ -17208,10 +17405,14 @@ function MeetingMap(inConfig) {
 	function isFilterVisible() {
 		return config.filter_visible && config.filter_visible == 1;
 	}
-	/************************************************************************************//**
-	 *	\brief Load the map and set it up.													*
-	 ****************************************************************************************/
-
+	/**
+	 * Creates the map and adds the various ornaments like search buttons and menus.
+	 * @param HTMLElement inDiv Element that contains the map.
+	 * @param Object menuContext Contains info for the map menu.  For instance, for [bmlt_map], the dropdown filters.
+	 * @param {*} handlebarMapOptions
+	 * @param Function cb
+	 * @param boolean hide
+	 */
 	function loadMap(inDiv, menuContext, handlebarMapOptions=null,cb=null,hide=false) {
 		if (inDiv) {
 			crouton_Handlebars.registerPartial("markerContentsTemplate", crouton_Handlebars.compile(config['marker_contents_template']));
@@ -17238,8 +17439,8 @@ function MeetingMap(inConfig) {
 					gDelegate.addListener('idle', triggerCroutonMapNewQuery, false);
 				} else {
 					gDelegate.addListener('zoomend', function (ev) {
-						if (shouldRedrawMarkers() && gAllMeetings) {
-							if (listOnlyVisible) {
+						if (shouldRedrawMarkers() && gAllMeetings && !gLocationSearchResult) {
+							if (gListOnlyVisible) {
 								const oldValue = filterVisible(false);
 								searchResponseCallback();
 								filterVisible(oldValue);
@@ -17285,9 +17486,7 @@ function MeetingMap(inConfig) {
 		controlDiv.querySelector("#bmltsearch-text-button").addEventListener('click', function () {
 			let text = document.getElementById("bmltsearch-goto-text").value.trim();
 			if (text === "") return;
-			showThrobber();
-			gDelegate.callGeocoder(text, null, mapSearchGeocode);
-			clearMessageAndClose(gSearchModal);
+			gDelegate.callGeocoder(text, mapSearchGeocode);
 		});
 		controlDiv.querySelector("#modal-seach-parameters").style.display = 'none';
 		controlDiv.querySelector("#show-search-parameters").addEventListener('click', function (e) {
@@ -17317,12 +17516,84 @@ function MeetingMap(inConfig) {
 		});
 
 		controlDiv.querySelector("#bmltsearch-clicksearch").addEventListener('click', clickSearch);
-		[...controlDiv.getElementsByClassName('modal-close')].forEach((elem)=>elem.addEventListener('click', (e)=>clearMessageAndClose(e.target)));
+		[...controlDiv.getElementsByClassName('modal-close')].forEach((elem)=>elem.addEventListener('click', (e)=>closeModalWindow(e.target)));
 		gSearchModal = controlDiv.querySelector("#bmltsearch_modal");
 		gSearchModal.parentElement.removeChild(gSearchModal);
 
 		return controlDiv;
 	}
+	var gLocationSearchModal;
+	var gDefaultLocationSearchButtonLabel = '';
+	function doGeolocationThenClose() {
+		doGeolocation().then(closeModalWindow(gLocationSearchModal));
+	}
+	function createLocationSearchButton() {
+		const template = hbs_Crouton.templates['locationSearch'];
+		const controlDiv = document.createElement('div');
+		const params = {};
+		controlDiv.innerHTML = template(params);
+		controlDiv.querySelector("#location-search-button").addEventListener('click', showLocationSearchDialog);
+		gDefaultLocationSearchButtonLabel = controlDiv.querySelector("#location-search-button :first-child").innerHTML;
+		controlDiv.querySelector("#bmlt-location-search-nearbyMeetings").addEventListener('click', doGeolocationThenClose);
+		controlDiv.querySelector("#bmlt-location-search-goto-text").addEventListener('keypress', function (event) {
+			if (event.key === "Enter") {
+				event.preventDefault();
+				document.getElementById("bmlt-location-search-text-button").click();
+			}
+		});
+		controlDiv.querySelector("#bmlt-location-search-text-button").addEventListener('click', function () {
+			let text = document.getElementById("bmlt-location-search-goto-text").value.trim();
+			if (text === "") return;
+			if (isMapVisible()) {
+				gDelegate.callGeocoder(text, locationSearchOpenMapGeocode);
+			} else {
+				gDelegate.callGeocoder(text, locationSearchGeocode);
+			}
+		});
+		controlDiv.querySelector("#bmlt-location-search-widen").addEventListener('click', function () {
+			if (gLocationSearchResult === null) {
+				if (gListOnlyVisible && gSearchPoint) {
+					gLocationSearchResult = {center: gSearchPoint, bounds: gDelegate.getBounds(), zoom: gDelegate.getZoom()};
+				} else return;
+			}
+			if (gLocationSearchResult.zoom == config.minZoom) return;
+			filterVisible(false);
+			let bounds = gDelegate.calculateBoundsFromCenterAndZoom(gLocationSearchResult.center, gLocationSearchResult.zoom);
+			let knt = filterMeetingsAndBounds(bounds).length;
+			for (let zoom = gLocationSearchResult.zoom-1; zoom >= config.minZoom; zoom = zoom-1) {
+				bounds = gDelegate.calculateBoundsFromCenterAndZoom(gLocationSearchResult.center, zoom);
+				if (filterMeetingsAndBounds(bounds).length > knt) {
+					if (isMapVisible()) {
+						gDelegate.flyToFixedZoom(gLocationSearchResult.center, zoom, filterVisible);
+						gLocationSearchResult = null;
+					} else {
+						gLocationSearchResult.zoom = zoom;
+						gLocationSearchResult.bounds = bounds;
+						gListOnlyVisible = false; // force new calc.
+						filterVisible(true, gLocationSearchResult.bounds);
+					}
+					closeModalWindow(gLocationSearchModal);
+					return;
+				}
+			}
+			bounds = gDelegate.calculateBoundsFromCenterAndZoom(gLocationSearchResult.center, gLocationSearchResult.zoom);
+			filterVisible(true, bounds);
+			alert("No further matches");
+		});
+		controlDiv.querySelector("#bmlt-location_search-cancel").addEventListener('click', function () {
+			filterVisible(false);
+			setLocationSearchButtonLabel('');
+			closeModalWindow(gLocationSearchModal);
+		});
+		[...controlDiv.getElementsByClassName('modal-close')].forEach((elem)=>elem.addEventListener('click', (e)=>closeModalWindow(e.target)));
+		gLocationSearchModal = controlDiv.querySelector("#bmlt_location_search_modal");
+		gLocationSearchModal.parentElement.removeChild(gLocationSearchModal);
+
+		return controlDiv;
+	}
+	function isMapVisible() {
+		return gDelegate.isMapVisible() && crouton.isEmbeddedMapShowing();
+	}
 	var next24status = false;
 	function createNext24Toggle() {
 		const toggleSrc = `
@@ -17348,14 +17619,14 @@ function MeetingMap(inConfig) {
 		}`
 			.replace("__text1__", crouton.localization.getWord("Upcoming Meetings"))
 			.replace("__text2__", crouton.localization.getWord("All Meetings"));
-		var controlDiv = document.createElement('div');
+		const controlDiv = document.createElement('div');
 		controlDiv.innerHTML = toggleSrc;
 		controlDiv.querySelector(".onoffswitch").addEventListener('click', function (event) {
 			if (event.pointerId < 0) return;
 			next24status = !next24status;
-			fitDuringFilter = false;
+			gAllowExpandViewport = false;
 			crouton.filterNext24(next24status);
-			fitDuringFilter = true;
+			gAllowExpandViewport = true;
 		});
 		let style = document.createElement('style');
     	style.innerHTML = rules;
@@ -17363,15 +17634,18 @@ function MeetingMap(inConfig) {
 		return controlDiv;
 	}
 	function createMenuButton(menuContext) {
-		var template = hbs_Crouton.templates['mapMenu'];
-		var controlDiv = document.createElement('div');
+		const template = hbs_Crouton.templates['mapMenu'];
+		const controlDiv = document.createElement('div');
 		controlDiv.innerHTML = template(menuContext);
 		controlDiv.querySelector("#nearbyMeetings").addEventListener('click', function (e) {
 			retrieveGeolocation().then(position => {
 				filterVisible(false);
-				gDelegate.setViewToPosition(position, filterMeetingsAndBounds, filterVisible);
-				gSearchPoint = {"lat": position.latitude, "lng": position.longitude};
+				gSearchPoint = {"lat": position.lat, "lng": position.lng};
 				crouton.updateDistances();
+				const locationSearchResult = gDelegate.getZoomAdjustedBounds(gSearchPoint, filterMeetingsAndBounds, config.locationSearchZoom ?? 12);
+				gDelegate.flyToFixedZoom(position, locationSearchResult.zoom, filterVisible);
+				filterVisible(true);
+				setLocationSearchButtonLabel(crouton.localization.getWord('closest meetings'));
 
 			}).catch(error => {
 				console.log(error.message);
@@ -17393,7 +17667,7 @@ function MeetingMap(inConfig) {
 			if (dropdownContent.style.display == "inline-block") {
 				dropdownContent.style.display = "none";
 			} else {
-				jQuery("#filteringByVisibility").html(listOnlyVisible?'&#10004;':'');
+				jQuery("#filteringByVisibility").html(gListOnlyVisible?'&#10004;':'');
 				dropdownContent.style.display = "inline-block";
 			}
 		});
@@ -17401,13 +17675,11 @@ function MeetingMap(inConfig) {
 		controlDiv.querySelector("#close_table").addEventListener('click', hideListView);
 		controlDiv.querySelector("#goto-text").addEventListener('keydown', function (event) {
 			if (event && event.key == "Enter") {
-				closeModalWindow(event.target);
-				lookupLocation(g_suspendedFullscreen);
+				lookupLocation(document.getElementById('goto-text').value,g_suspendedFullscreen, mapMenuGeocode);
 			}
 		});
 		controlDiv.querySelector("#goto-button").addEventListener('click', function (event) {
-			closeModalWindow(event.target);
-			lookupLocation(g_suspendedFullscreen);
+			lookupLocation(document.getElementById('goto-text').value, g_suspendedFullscreen, mapMenuGeocode);
 		});
 
 		return controlDiv;
@@ -17415,6 +17687,17 @@ function MeetingMap(inConfig) {
 	function hasMapSearch() {
 		return 'map_search' in config;
 	}
+	/**
+	 * Load the meetings for [bmlt_tabs] and [bmlt_map]: all the meetings, during map initialization.
+	 * @param string inDiv_id selector for the div that will contain the map.
+	 * @param Array meetings_responseObject the meetings returned from the server and enhanced by the crouton core.
+	 * @param {*} menuContext information about the dropdown filters.
+	 * @param {*} handlebarMapOptions
+	 * @param boolean fitBounds should we expand our map so that all the meetings are visible?
+	 * @param function callback called after map has been initialized
+	 * @param boolean hide make the map invisisble
+	 * @returns
+	 */
 	function loadFromCrouton(inDiv_id, meetings_responseObject, menuContext = null, handlebarMapOptions = null, fitBounds = true, callback, hide) {
 		if (!gDelegate.isApiLoaded()) {
 			preloadApiLoadedCallback(loadFromCrouton, [inDiv_id, meetings_responseObject, menuContext, handlebarMapOptions, fitBounds, callback, hide]);
@@ -17423,8 +17706,15 @@ function MeetingMap(inConfig) {
 		}
 		let inDiv = document.getElementById(inDiv_id);
 		loadMap(inDiv, menuContext, handlebarMapOptions, callback, hide);
-		loadAllMeetings(meetings_responseObject, fitBounds, true);
+		loadAllMeetings(meetings_responseObject, fitBounds);
 	};
+	/**
+	 * The map on the meeting details popup modal.
+	 * @param string inDiv_id selector for the div that will contain the map.
+	 * @param Object meeting
+	 * @param {*} handlebarMapOptions
+	 * @returns
+	 */
 	function loadPopupMap(inDiv_id, meeting, handlebarMapOptions = null) {
 		if (!gDelegate.isApiLoaded()) {
 			preloadApiLoadedCallback(loadPopupMap, [inDiv_id, meeting, handlebarMapOptions]);
@@ -17442,25 +17732,21 @@ function MeetingMap(inConfig) {
 			gModalDelegate = delegate;
 		}
 	};
-	var fitDuringFilter = true;
-	function filterFromCrouton(filter) {
-		gMeetingIdsFromCrouton = filter;
+	var gAllowExpandViewport = true;
+	function setFilteredIds(ids) {
+		gMeetingIdsFromCrouton = ids;
 		if (gAllMeetings)
-			searchResponseCallback(fitDuringFilter && !listOnlyVisible);
+			searchResponseCallback(gAllowExpandViewport && !gListOnlyVisible);
 	};
-	function clearMessageAndClose(modal) {
-		jQuery('#zoomed-out-message').not('.hide').addClass('hide');
-		closeModalWindow(modal);
-	}
 	function nearMeSearch() {
 		retrieveGeolocation().then(position => {
 			showThrobber();
-			gSearchPoint = {"lat": position.latitude, "lng": position.longitude};
-			crouton.searchByCoordinates(position.latitude, position.longitude, config.map_search.width);
-			if (activeModal == gSearchModal) clearMessageAndClose(gSearchModal);
+			gSearchPoint = {"lat": position.lat, "lng": position.lng};
+			crouton.searchByCoordinates(position.lat, position.lng, config.map_search.width);
+			if (gActiveModal == gSearchModal) closeModalWindow(gSearchModal);
 		}).catch(error => {
 			console.log(error.message);
-			if (activeModal != gSearchModal) showBmltSearchDialog();
+			if (gActiveModal != gSearchModal) showBmltSearchDialog();
 		});
 	};
 	function clickSearch(e) {
@@ -17470,7 +17756,7 @@ function MeetingMap(inConfig) {
 			gSearchPoint = {"lat": lat, "lng": lng};
 			crouton.searchByCoordinates(lat, lng, config.map_search.width);
 		});
-		clearMessageAndClose(gSearchModal);
+		closeModalWindow(gSearchModal);
 	}
 	function createThrobber(inDiv) {
 		if (!inDiv.myThrobber) {
@@ -17480,7 +17766,7 @@ function MeetingMap(inConfig) {
 				inDiv.myThrobber.className = 'bmlt_map_throbber_div';
 				inDiv.myThrobber.style.display = 'none';
 				inDiv.appendChild(inDiv.myThrobber);
-				var img = document.createElement("img");
+				const img = document.createElement("img");
 
 				if (img) {
 					img.src = config.BMLTPlugin_images ? config.BMLTPlugin_images + "/Throbber.gif"
@@ -17505,19 +17791,104 @@ function MeetingMap(inConfig) {
 			gInDiv.myThrobber.style.display = 'none';
 		};
 	};
+	function setLocationSearchButtonLabel(label) {
+		if (!label || label==='')
+			jQuery("#location-search-button :first-child").html(gDefaultLocationSearchButtonLabel);
+		else if (gDefaultLocationSearchButtonLabel && gDefaultLocationSearchButtonLabel !== '') {
+			let html = gDefaultLocationSearchButtonLabel.replace(crouton.localization.getWord("Search by Location"), label);
+			jQuery("#location-search-button :first-child").html(html);
+		}
+	}
+	function openMapGeocode(resp, modalName, initial=false) {
+		chooseResponse(modalName, resp, function(resp, i) {
+			let center = gDelegate.getGeocodeCenterAndBounds(resp,i).center;
+			gSearchPoint = {"lat": center.lat, "lng": center.lng};
+			crouton.updateDistances(initial);
+			const modal = document.getElementById(modalName);
+			closeModalWindow(modal);
+			filterVisible(false);
+			const centerAndBounds = gDelegate.getGeocodeCenterAndBounds(resp, i);
+			if (!centerAndBounds) return;
+			const zoom = calcZoomThatContainsBoundingBox(centerAndBounds);
+			const locationSearchResult = gDelegate.getZoomAdjustedBounds(gSearchPoint, filterMeetingsAndBounds, zoom);
+			gDelegate.flyToFixedZoom(gSearchPoint, locationSearchResult.zoom, filterVisible);
+			searchResponseCallback();
+		})
+	}
+	function mapMenuGeocode(resp) {
+		openMapGeocode(resp, "geocoding_modal");
+	}
+	function mapMenuGeocodeInitial(resp) {
+		openMapGeocode(resp, "geocoding_modal", true);
+	}
 	function mapSearchGeocode(resp) {
-		showThrobber();
-		if (document.getElementById("bmltsearch-goto-text"))
-			document.getElementById("bmltsearch-goto-text").value = "";
-		let latlng = gDelegate.getGeocodeCenter(resp);
-		if (!latlng) {
-			hideThrobber();
+		chooseResponse('bmltsearch_modal', resp, function(resp, i) {
+			closeModalWindow(gSearchModal);
+			if (document.getElementById("bmltsearch-goto-text"))
+				document.getElementById("bmltsearch-goto-text").value = "";
+			let latlng = gDelegate.getGeocodeCenterAndBounds(resp,i).center;
+			if (!latlng) return;
+			showThrobber();
+			gSearchPoint = {"lat": latlng.lat, "lng": latlng.lng};
+			crouton.searchByCoordinates(latlng.lat, latlng.lng, config.map_search.width);
+		});
+	}
+	function chooseResponse(modalName, resp, callback) {
+		if (jQuery('#'+modalName).is(":hidden")) {
+			callback(resp, 0);
+			return;
+		}
+		const choices = gDelegate.getGeocodingChoices(resp);
+		if (choices.length < 2) {
+			setLocationSearchButtonLabel(choices[0]);
+			callback(resp, 0);
 			return;
 		}
-		gSearchPoint = {"lat": latlng.lat, "lng": latlng.lng};
-		crouton.searchByCoordinates(latlng.lat, latlng.lng, config.map_search.width);
+		const html = choices.map((choice, index) =>
+			'<button class="location-choice" data-choice="'+index+'">'+choice+'</button>'
+		);
+		jQuery('#'+modalName+' .crouton-modal-search-page').addClass('hide');
+		jQuery('#'+modalName+' .crouton-modal-search-choice').removeClass('hide')
+			.html('<div class="choose-location"><h4>'+crouton.localization.getWord('Choose one')+'</h4>'+html.join('')+'</div>')
+		jQuery('#'+modalName+' .location-choice').on('click', function() {
+			const index = parseInt(jQuery(this).data("choice"))
+			setLocationSearchButtonLabel(choices[index]);
+			callback(resp, index);
+		})
+	}
+	function locationSearchOpenMapGeocode(resp) {
+		openMapGeocode(resp, 'bmlt_location_search_modal');
+	}
+	function calcZoomThatContainsBoundingBox(centerAndBounds) {
+		const center = {lat: (centerAndBounds.southWest.lat + centerAndBounds.northEast.lat)/2,
+						lng: (centerAndBounds.southWest.lng + centerAndBounds.northEast.lng)/2,};
+		let zoom = config.locationSearchZoom + 1;
+		do {
+			if (zoom <= config.minZoom) break;
+			zoom = zoom - 1;
+			var bounds = gDelegate.calculateBoundsFromCenterAndZoom(center, zoom);
+		} while (!gDelegate.contains(bounds, centerAndBounds.southWest.lat, centerAndBounds.southWest.lng)
+			     || !gDelegate.contains(bounds, centerAndBounds.northEast.lat, centerAndBounds.northEast.lng))
+		return zoom;
+	}
+	function locationSearchGeocodeInitial(resp) {
+		locationSearchGeocode(resp, true);
+	}
+	function locationSearchGeocode(resp, initial=false) {
+		chooseResponse('bmlt_location_search_modal', resp, function(resp, i) {
+			closeModalWindow(gLocationSearchModal);
+			const centerAndBounds = gDelegate.getGeocodeCenterAndBounds(resp, i);
+			if (!centerAndBounds) return;
+			let center = centerAndBounds.center;
+			filterVisible(false);
+			let zoom = calcZoomThatContainsBoundingBox(centerAndBounds);
+			gLocationSearchResult = gDelegate.getZoomAdjustedBounds(center, filterMeetingsAndBounds, zoom);
+			gSearchPoint = {"lat": gLocationSearchResult.center.lat, "lng": gLocationSearchResult.center.lng};
+			filterVisible(true, gLocationSearchResult.bounds);
+			crouton.updateDistances(initial);
+		});
 	}
-	function loadAllMeetings(meetings_responseObject, fitBounds=true, fitAll=false) {
+	function loadAllMeetings(meetings_responseObject, fitBounds=true) {
 		if (meetings_responseObject === null && config.map_search) {
 			if (config.map_search.auto) nearMeSearch();
 			else if (config.map_search.coordinates_search) {
@@ -17526,12 +17897,12 @@ function MeetingMap(inConfig) {
 				gSearchPoint = {"lat": config.map_search.latitude, "lng": config.map_search.longitude};
 				crouton.searchByCoordinates(config.map_search.latitude, config.map_search.longitude, config.map_search.width);
 			}
-			else if (config.map_search.location) gDelegate.callGeocoder(config.map_search.location, null, mapSearchGeocode);
+			else if (config.map_search.location) gDelegate.callGeocoder(config.map_search.location, mapSearchGeocode);
 			else showBmltSearchDialog();
 			return;
 		}
 		gAllMeetings = meetings_responseObject.filter(m => m.venue_type != 2);
-		if (fitBounds) {
+		if (fitBounds && !config.centerMe && !config.goto) {
 			let lat_lngs = gAllMeetings.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[]);
 			const maxRadius = config.maxTomatoWidth/2.0;
 			if (gSearchPoint) lat_lngs.push([gSearchPoint.lat, gSearchPoint.lng]);
@@ -17547,31 +17918,45 @@ function MeetingMap(inConfig) {
 		}
 		searchResponseCallback();
 		hideThrobber();
-		if (isFilterVisible() || config.centerMe || config.goto) crouton.forceShowMap();
-		if (config.centerMe) {
-			if (navigator.geolocation) {
-				navigator.geolocation.getCurrentPosition(
-					function (position) {
-						coords = {latitude: position.coords.latitude, longitude: position.coords.longitude};
-						filterVisible(false);
-						if (config.zoom) gDelegate.setZoom(false, config.zoom);
-						gDelegate.setViewToPosition(coords, filterMeetingsAndBounds, () => {
-							filterVisible(isFilterVisible());
-						});
-						gSearchPoint = {"lat": position.coords.latitude, "lng": position.coords.longitude};
-						crouton.updateDistances(true);
-					},
-					showGeocodingDialog
-				);
-			} else if (fitAll) {
-				showGeocodingDialog();
-			}
-		} else {
-			if ((!config.centerMe && !config.goto) && !(config.map_search && isFilterVisible())) {
-			  gDelegate.afterInit(()=>filterVisible(isFilterVisible()));
+		gDelegate.afterInit(!crouton.isEmbeddedMapShowing(), () => {
+			if (config.centerMe) {
+				doGeolocation(isFilterVisible(), true).catch(error => showGeocodingDialog());
+			} else {
+				if ((!config.centerMe && !config.goto) && !(config.map_search && isFilterVisible())) {
+			  		filterVisible(isFilterVisible());
+				}
+				if (config.goto) {
+					if (isMapVisible()) {
+						gDelegate.callGeocoder(config.goto, mapMenuGeocodeInitial);
+					} else {
+						gDelegate.callGeocoder(config.goto, locationSearchGeocodeInitial);
+					}
+				}
 			}
-			if (config.goto) gDelegate.callGeocoder(config.goto, isFilterVisible() ? resetVisibleThenFilterMeetingsAndBounds : setVisibleThenFilterMeetingsAndBounds);
-		}
+		});
+	}
+	function doGeolocation(makeFilterVisible=true, initial=false) {
+		return new Promise((resolve, reject) =>
+			retrieveGeolocation().then(function(coords) {
+				filterVisible(false);
+				if (isMapVisible() || !makeFilterVisible) {
+					const locationSearchResult = gDelegate.getZoomAdjustedBounds(coords, filterMeetingsAndBounds, config.locationSearchZoom ?? 12);
+					gDelegate.flyToFixedZoom(coords, locationSearchResult.zoom, () => {
+						filterVisible(makeFilterVisible);
+						if (makeFilterVisible) setLocationSearchButtonLabel(crouton.localization.getWord('closest meetings'));
+					});
+				} else {
+					gLocationSearchResult = gDelegate.getZoomAdjustedBounds(coords, filterMeetingsAndBounds, config.locationSearchZoom ?? 12);
+					filterVisible(true, gLocationSearchResult.bounds);
+					setLocationSearchButtonLabel(crouton.localization.getWord('closest meetings'));
+				}
+				gSearchPoint = coords;
+				crouton.updateDistances(initial);
+				resolve(coords);
+			}).catch(error => {
+				reject(error);
+			})
+		);
 	}
 	function createCityHash(allMeetings) {
 		return allMeetings.reduce(function(prev, meeting) {
@@ -17584,11 +17969,12 @@ function MeetingMap(inConfig) {
 	}
 	var g_suspendedFullscreen = false;
 	var g_overflowX;
-	var activeModal = null;
+	var gActiveModal = null;
 	var swipableModal = false;
 	function closeModalWindow(modal) {
 		gDelegate.modalOff();
-		activeModal = null;
+		gActiveModal = null;
+		if (!modal) return;
 		if (!modal.classList.contains("modal"))
 			return closeModalWindow(modal.parentNode);
 		modal.style.display = "none";
@@ -17608,8 +17994,8 @@ function MeetingMap(inConfig) {
 		}
 	}
 	document.addEventListener("keydown", function(event) {
-		if (activeModal && event.key == "Escape") {
-			closeModalWindow(activeModal);
+		if (gActiveModal && event.key == "Escape") {
+			closeModalWindow(gActiveModal);
 		}
 	}, true);
 	function openModalWindow(modal,swipe=false) {
@@ -17619,9 +18005,10 @@ function MeetingMap(inConfig) {
 		}
 		if (!modal) return;
 		modal.style.display = "block";
+		document.body.appendChild(modal);
 		swipableModal = swipe;
 		modal.focus();
-		activeModal = modal;
+		gActiveModal = modal;
 		dd = document.getElementById("map-menu-dropdown");
 		if (dd) dd.style.display = "none";
 		gDelegate.modalOn();
@@ -17639,15 +18026,30 @@ function MeetingMap(inConfig) {
 		openModalWindow(document.getElementById('filter_modal'));
 	}
 	function showBmltSearchDialog(e) {
-		if (!document.getElementById('bmltsearch_modal')) gInDiv.appendChild(gSearchModal);
+		openModalWindow(gSearchModal);
 		if (gDelegate.isMapDefined())
 			jQuery('#bmltsearch-clicksearch').parent().show();
 		else
 			jQuery('#bmltsearch-clicksearch').parent().hide();
-		openModalWindow(gSearchModal);
+		jQuery('#zoomed-out-message').addClass('hide');
+		jQuery('#bmltsearch_modal .crouton-modal-search-page').removeClass('hide');
+		jQuery('#bmltsearch_modal .crouton-modal-search-choice').addClass('hide');
+	}
+	function showLocationSearchDialog(e) {
+		openModalWindow(gLocationSearchModal);
+		if ((gSearchPoint !== null) && gListOnlyVisible) {
+			jQuery("#location-search-widen").removeClass('hide');
+		} else {
+			jQuery("#location-search-widen").addClass('hide');
+		}
+		jQuery('#bmlt_location_search_modal .crouton-modal-search-page').removeClass('hide');
+		jQuery('#bmlt_location_search_modal .crouton-modal-search-choice').addClass('hide');
+		jQuery('bmlt-location-search-goto-text').val('');
 	}
 	function showGeocodingDialog(e=null) {
 		openModalWindow(document.getElementById('geocoding_modal'));
+		jQuery('#geocoding_modal .crouton-modal-search-page').removeClass('hide');
+		jQuery('#geocoding_modal .crouton-modal-search-choice').addClass('hide');
 	}
 	function showListView(e=null) {
 		filterVisible();
@@ -17663,36 +18065,17 @@ function MeetingMap(inConfig) {
 		jQuery("#table_page").addClass("hide");
 		jQuery("#bmlt-map").css("display", "block");
 	}
-	function resetVisibleThenFilterMeetingsAndBounds(bounds, center=null) {
-		filterVisible(false);
-		const ret = filterMeetingsAndBounds(bounds);
-		filterVisible(true);
-		if (gSearchPoint.lat != center.lat || gSearchPoint.lng != center.lng) {
-			gSearchPoint = center;
-			crouton.updateDistances();
-		}
-		return ret;
-	}
-	function setVisibleThenFilterMeetingsAndBounds(bounds, center=null) {
-		filterVisible(false);
-		const ret = filterMeetingsAndBounds(bounds);
-		if (gSearchPoint.lat != center.lat || gSearchPoint.lng != center.lng) {
-			gSearchPoint = center;
-			crouton.updateDistances();
-		}
-		return ret;
-	}
-	function lookupLocation(fullscreen) {
-		if (document.getElementById('goto-text').value != '') {
+	function lookupLocation(location,fullscreen, callback) {
+		if (location != '') {
 			if (fullscreen) {
 				gDelegate.addListener('idle', function () {
-					gDelegate.callGeocoder(document.getElementById('goto-text').value, resetVisibleThenFilterMeetingsAndBounds);
+					gDelegate.callGeocoder(location, callback);
 				}, true);
 			} else {
-				gDelegate.callGeocoder(document.getElementById('goto-text').value, resetVisibleThenFilterMeetingsAndBounds);
+				gDelegate.callGeocoder(location, callback);
 			}
 		} else {
-			alert("");
+			alert("Location not found");
 		};
 		return true;
 	};
@@ -17700,19 +18083,9 @@ function MeetingMap(inConfig) {
 		if (!gAllMeetings || !gAllMeetings.length) {
 			return;
 		};
-		try {
-			drawMarkers(expand);
-			if (gSearchPoint) {
-				gDelegate.markSearchPoint([gSearchPoint.lat, gSearchPoint.lng]);
-			}
-		} catch (e) {
-			console.log(e);
-			gDelegate.addListener('projection_changed', function (ev) {
-				drawMarkers(expand);
-				if (gSearchPoint) {
-					gDelegate.markSearchPoint([gSearchPoint.lat, gSearchPoint.lng]);
-				}
-			}, true);
+		drawMarkers(expand);
+		if (gSearchPoint) {
+			gDelegate.markSearchPoint([gSearchPoint.lat, gSearchPoint.lng]);
 		}
 	};
 	/****************************************************************************************
@@ -17760,33 +18133,55 @@ function MeetingMap(inConfig) {
 			gDelegate.fitBounds(lat_lngs);
 		}
 	};
+	function latLngToWebMercator(latlng, zoom) {
+    	const lat = Math.max(-85.05112878, Math.min(85.05112878, latlng.lat));
+    	const phi = lat * Math.PI / 180;
+    	const scale = 256 * Math.pow(2, zoom);
+
+    	const x = scale * ((latlng.lng/360.) + .5);
+    	const y =
+      		scale * (Math.PI - Math.log(Math.tan(Math.PI / 4 + phi / 2))) / (2 * Math.PI);
+    	return { x: x, y: y };
+	}
+	function webMercatorToLatLng(point, zoom) {
+   		const scale = 256 * Math.pow(2, zoom);
+
+    	const lng = 360 * (point.x / scale - .5);
+    	const t = Math.exp(Math.PI - (2 * Math.PI) * (point.y / scale));
+    	const phi = 2 * Math.atan(t) - Math.PI / 2; // radians
+
+    	return { lat: phi * 180 / Math.PI, lng: lng };
+	}
 	function mapOverlappingMarkersInCity(in_meeting_array)	///< Used to draw the markers when done.
 	{
-		var tolerance = 8;	/* This is how many pixels we allow. */
+		const tolerance = 8;	/* This is how many pixels we allow. */
 
-		var ret = new Array;
+		const ret = new Array;
+		const zoom = gDelegate.getZoom();
+		const center = latLngToWebMercator(gDelegate.getCenter(), zoom)
 		// We create this hash because we limit looking for "matches" to within one city.
 		for (const [city, meetings] of Object.entries(createCityHash(in_meeting_array))) {
 			// create a tmp object so we can mark which items haven't been matched yet.
-			var tmp = meetings.map((meeting) => {
+			const tmp = meetings.map((meeting) => {
 				item = new Object;
 				item.matched = false;
 				item.meeting = meeting;
-				item.coords = gDelegate.fromLatLngToPoint(meeting.latitude, meeting.longitude);
+				const point = latLngToWebMercator({lat: meeting.latitude, lng: meeting.longitude}, zoom);
+				item.coords = {x: point.x-center.x, y: point.y-center.y};
 				return item;
 			});
 			tmp.reduce(function(prev, item, index) {
 				if (item.matched) return prev;
 				matches = [item.meeting];
-				var outer_coords = item.coords;
+				const outer_coords = item.coords;
 				for (c2 = index+1; c2<meetings.length; c2++) {
 					if (tmp[c2].matched) continue;
-					var inner_coords = tmp[c2].coords;
+					const inner_coords = tmp[c2].coords;
 
-					var xmin = outer_coords.x - tolerance;
-					var xmax = outer_coords.x + tolerance;
-					var ymin = outer_coords.y - tolerance;
-					var ymax = outer_coords.y + tolerance;
+					const xmin = outer_coords.x - tolerance;
+					const xmax = outer_coords.x + tolerance;
+					const ymin = outer_coords.y - tolerance;
+					const ymax = outer_coords.y + tolerance;
 
 					/* We have an overlap. */
 					if ((inner_coords.x >= xmin) && (inner_coords.x <= xmax) && (inner_coords.y >= ymin) && (inner_coords.y <= ymax)) {
@@ -17803,8 +18198,8 @@ function MeetingMap(inConfig) {
 		return ret;
 	};
 	function sortMeetingSearchResponseCallback(mtg_a, mtg_b) {
-	var weekday_score_a = parseInt(mtg_a.weekday_tinyint, 10);
-	var weekday_score_b = parseInt(mtg_b.weekday_tinyint, 10);
+	const weekday_score_a = parseInt(mtg_a.weekday_tinyint, 10);
+	const weekday_score_b = parseInt(mtg_b.weekday_tinyint, 10);
 
 	if (weekday_score_a < config.start_week) {
 		weekday_score_a += 7;
@@ -17820,8 +18215,8 @@ function MeetingMap(inConfig) {
 	else if (weekday_score_a > weekday_score_b) {
 		return 1;
 	};
-	var time_a = mtg_a.start_time.toString().split(':');
-	var time_b = mtg_b.start_time.toString().split(':');
+	const time_a = mtg_a.start_time.toString().split(':');
+	const time_b = mtg_b.start_time.toString().split(':');
 	if (parseInt(time_a[0]) < parseInt(time_b[0])) {
 		return -1;
 	}
@@ -17853,77 +18248,77 @@ function MeetingMap(inConfig) {
 	 *	 \brief	This creates a single meeting's marker on the map.							*
 	 ****************************************************************************************/
 	function createMapMarker(meetings, openMarker) {
-		var main_point = [meetings[0].latitude, meetings[0].longitude];
+		const main_point = [meetings[0].latitude, meetings[0].longitude];
 		const marker_html = markerTemplate(meetings);
 		const marker = gDelegate.createMarker(main_point, (meetings.length > 1), null);
 		gDelegate.bindPopup(marker, marker_html, meetings.map((m)=>parseInt(m.id_bigint)), openMarker);
 	};
 	function createGroupMarker(group, openMarker) {
-		var main_point = [group.latitude, group.longitude];
+		const main_point = [group.latitude, group.longitude];
 		const marker = gDelegate.createMarker(main_point, group['membersOfGroup'].length > 1, null);
 		gDelegate.addMarkerCallback(marker, function() {
 			crouton.openMeetingModal(group);
 		});
 	};
-	var listOnlyVisible = false;
-	var listener = null;
+	var gListOnlyVisible = false;
+	var gDragStartListener = null;
 	function filterBounds(bounds) {
 		return gAllMeetings.filter((meeting) => gDelegate.contains(bounds, meeting.latitude, meeting.longitude));
 	}
 	function onDragStart() {
-		isMouseDown = true;
+		gCurrentlyDraggingMap = true;
 		// if no [crouton_map], then show all meetings
 		if (!config.map_search) filterVisible(false);
 		gDelegate.addListener('dragend', onDragEnd, true);
 	}
 	function onDragEnd() {
-		isMouseDown = false;
+		gCurrentlyDraggingMap = false;
 		// if no [crouton_map], then turn filter visible back on.
 		if (config.map_search && isFilterVisible()) triggerCroutonMapNewQuery(null);
 		else filterVisible(true);
 	}
 	function triggerCroutonMapNewQuery(ev) {
-		if (isMouseDown) return;
+		if (gCurrentlyDraggingMap) return;
 		gMeetingIdsFromCrouton = null;
 		corners = gDelegate.getCorners();
-		if (oldBounds && gDelegate.contains(oldBounds,corners.ne.lat,corners.ne.lng)
-					  && gDelegate.contains(oldBounds,corners.sw.lat,corners.sw.lng)) {
+		if (gOldBounds && gDelegate.contains(gOldBounds,corners.ne.lat,corners.ne.lng)
+					  && gDelegate.contains(gOldBounds,corners.sw.lat,corners.sw.lng)) {
 			filterVisible();
 		} else if (getScreenRadius('km') > config.maxTomatoWidth) {
 			jQuery('#zoomed-out-message').removeClass('hide');
 			showBmltSearchDialog(null);
 		} else {
-			oldBounds = gDelegate.getBounds();
+			gOldBounds = gDelegate.getBounds();
 			showThrobber();
 			crouton.searchByCoordinates(gDelegate.getCenter().lat, gDelegate.getCenter().lng, getScreenRadius(), false);
 		}
 	}
-	function filterVisible(on=true) {
-		if (on==listOnlyVisible && !config.map_search) return on;
-		let mtgs = on ? filterBounds(gDelegate.getBounds()) : gAllMeetings;
+	function filterVisible(on=true, bounds = gDelegate.getBounds()) {
+		if (on==gListOnlyVisible && !config.map_search) return on;
+		let mtgs = on ? filterBounds(bounds) : gAllMeetings;
 		let visible = mtgs.map((m)=>m.id_bigint);
 		jQuery(".bmlt-data-row").each(function(index,row) {
 			row.dataset.visible = (visible.includes(row.id.split('-').pop())) ? '1' : '0';
 		});
 		jQuery("#byday").removeClass('hide');
 		jQuery("#filter-dropdown-visibile").val(on?'a-1':'');
-		fitDuringFilter = false;
-		crouton.simulateFilterDropdown();
-		fitDuringFilter = true;
+		gAllowExpandViewport = false; // calling simulateFilterDropdown will callback croutonMap to set the filtered Ids.
+		crouton.simulateFilterDropdown();  // but we don't want to expand the viewport.
+		gAllowExpandViewport = true;
 		jQuery("#filteringByVisibility").html(on?'&#10004;':'');
-		listOnlyVisible = on;
-		if (on) listener = gDelegate.addListener('dragstart', onDragStart, true);
-		else if (listener) {
-			gDelegate.removeListener(listener);
-			listener = null;
+		gListOnlyVisible = on;
+		if (on) gDragStartListener = gDelegate.addListener('dragstart', onDragStart, true);
+		else if (gDragStartListener) {
+			gDelegate.removeListener(gDragStartListener);
+			gDragStartListener = null;
 		}
 		return !on;
 	}
 	function toggleVisible() {
-		filterVisible(!listOnlyVisible);
+		filterVisible(!gListOnlyVisible);
 	}
 	function filterBounds(bounds) {
-		var ret = gAllMeetings.filter((meeting) =>
+		const ret = gAllMeetings.filter((meeting) =>
 			gDelegate.contains(bounds, meeting.latitude, meeting.longitude));
 		return ret;
 	}
@@ -17933,31 +18328,31 @@ function MeetingMap(inConfig) {
 		if ((gDelegate.getZoom()>=14) && gDelegate.contains(gDelegate.getBounds(), meeting.latitude, meeting.longitude)) {
 			gDelegate.openMarker(meetingId);
 		} else {
-			gDelegate.setViewToPosition({latitude: meeting.latitude, longitude: meeting.longitude}, filterMeetingsAndBounds, function() {gDelegate.openMarker(meetingId);});
+			gDelegate.flyToFixedZoom({lat: meeting.latitude, lng: meeting.longitude}, config.focusedMeetingPopupZoomLevel ?? 14, function() {gDelegate.openMarker(meetingId);});
 		}
 	}
 	function filterMeetingsAndBounds(bounds) {
 		return filterMeetings(filterBounds(bounds));
 	}
 	function filterMeetings(in_meetings_array) {
-		var ret = in_meetings_array.filter(m => m.venue_type != 2);
+		const ret = in_meetings_array.filter(m => m.venue_type != 2);
 		if (gMeetingIdsFromCrouton != null) {
 			return ret.filter((m) => gMeetingIdsFromCrouton.includes(m.id_bigint));
 		}
 		return ret;
 	}
-	var _isPseudoFullscreen = false;
+	var gIsPseudoFullscreen = false;
 	function isFullscreen() {
-		var fullscreenElement =
+		const fullscreenElement =
 			document.fullscreenElement ||
 			document.mozFullScreenElement ||
 			document.webkitFullscreenElement ||
 			document.msFullscreenElement;
 
-		return (fullscreenElement === gInDiv) || _isPseudoFullscreen;
+		return (fullscreenElement === gInDiv) || gIsPseudoFullscreen;
 	}
 	function toggleFullscreen(options) {
-		var container = gInDiv;
+		const container = gInDiv;
 		if (isFullscreen()) {
 			if (options && options.pseudoFullscreen) {
 				_setFullscreen(false);
@@ -17988,10 +18383,9 @@ function MeetingMap(inConfig) {
 			}
 		}
 	}
-	var _isPseudoFullscreen = false;
 	function _setFullscreen(fullscreen) {
-		_isPseudoFullscreen = fullscreen;
-		var container = gInDiv;
+		gIsPseudoFullscreen = fullscreen;
+		const container = gInDiv;
 		if (fullscreen) {
 			L.DomUtil.addClass(container, 'leaflet-pseudo-fullscreen');
 		} else {
@@ -18006,6 +18400,12 @@ function MeetingMap(inConfig) {
 		}
 		gDelegate.invalidateSize();
 		if (!gAllMeetings) return;
+		if (gLocationSearchResult) {
+			searchResponseCallback();
+			filterVisible(false);
+			gDelegate.flyToFixedZoom(gLocationSearchResult.center, gLocationSearchResult.zoom, filterVisible);
+			gLocationSearchResult = null;
+		}
 		if (fitBounds) gDelegate.fitBounds(
 			((gMeetingIdsFromCrouton) ? gAllMeetings.filter((m) => gMeetingIdsFromCrouton.includes(m.id_bigint)) : gAllMeetings)
 				.reduce(function(a,m) {a.push([m.latitude, m.longitude]); return a;},[])
@@ -18016,14 +18416,14 @@ function MeetingMap(inConfig) {
 	}
 
 	function getDistance(p1, p2) {
-		var R = 6378137; // Earth’s mean radius in meter
-		var dLat = rad(p2.lat - p1.lat);
-		var dLong = rad(p2.lng - p1.lng);
-		var a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
+		const R = 6378137; // Earth’s mean radius in meter
+		const dLat = rad(p2.lat - p1.lat);
+		const dLong = rad(p2.lng - p1.lng);
+		const a = Math.sin(dLat / 2) * Math.sin(dLat / 2) +
     		Math.cos(rad(p1.lat)) * Math.cos(rad(p2.lat)) *
     		Math.sin(dLong / 2) * Math.sin(dLong / 2);
-		var c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
-		var d = R * c;
+		const c = 2 * Math.atan2(Math.sqrt(a), Math.sqrt(1 - a));
+		const d = R * c;
   		return d; // returns the distance in meter
 	}
 	function getDistanceFromSearch(p) {
@@ -18046,7 +18446,7 @@ function MeetingMap(inConfig) {
 	 ****************************************************************************************/
 	this.initialize = loadFromCrouton;
 	this.showMap = showMap;
-	this.fillMap = filterFromCrouton;
+	this.setFilteredIds = setFilteredIds;
 	this.rowClick = focusOnMeeting;
 	this.apiLoadedCallback = apiLoadedCallback;
 	this.refreshMeetings = loadAllMeetings;
@@ -18056,17 +18456,22 @@ function MeetingMap(inConfig) {
 	this.loadPopupMap = loadPopupMap;
 	this.filterVisible = filterVisible;
 	this.hasMapSearch = hasMapSearch;
+	this.createLocationSearchButton = createLocationSearchButton;
+	this.latLngToWebMercator = latLngToWebMercator;
+	this.webMercatorToLatLng = webMercatorToLatLng;
 };
 MeetingMap.prototype.initialize = null;
 MeetingMap.prototype.showMap = null;
-MeetingMap.prototype.fillMap = null;
+MeetingMap.prototype.setFilteredIds = null;
 MeetingMap.prototype.rowClick = null;
 MeetingMap.prototype.apiLoadedCallback = null;
 MeetingMap.prototype.refreshMeetings = null;
 MeetingMap.prototype.getDistanceFromSearch = null;
-
+MeetingMap.prototype.latLngToWebMercator = null;  // called from delegates - yuck!
+MeetingMap.prototype.webMercatorToLatLng = null;  // called from delegates - yuck!
 MeetingMap.prototype.openModalWindow = null;
 MeetingMap.prototype.closeModalWindow = null;
 MeetingMap.prototype.loadPopupMap = null;
 MeetingMap.prototype.filterVisible = null;
 MeetingMap.prototype.hasMapSearch = null;
+MeetingMap.prototype.createLocationSearchButton = null;