diff --git a/bmlt-meeting-list.php b/bmlt-meeting-list.php
index b0159d3..1cd18c0 100644
--- a/bmlt-meeting-list.php
+++ b/bmlt-meeting-list.php
@@ -384,7 +384,27 @@ function get_all_meetings() {
 			
 			return $all_meetings;
 		}
-
+		function get_fieldkeys() {
+			$results = $this->get_configured_root_server_request("client_interface/json/?switcher=GetFieldKeys");
+			return json_decode(wp_remote_retrieve_body($results), true);	
+		}
+		function get_nonstandard_fieldkeys() {
+			$all_fks = $this->get_fieldkeys();
+			$standard_keys = array(
+				"id_bigint","worldid_mixed","service_body_bigint",
+				"weekday_tinyint","start_time","duration_time","formats",
+				"lang_enum","longitude","latitude","meeting_name"."location_text",
+				"location_info","location_street","location_city_subsection",
+				"location_neighborhood","location_municipality","location_sub_province",
+				"location_province","location_postal_code_1","location_nation","comments","zone");
+			$ret = array();
+			foreach ($all_fks as $fk) {
+				if (!in_array($fk['key'],$standard_keys)) {
+					$ret[] = $fk;
+				}
+			}
+			return $ret;	
+		}
 		function get_areas() {
 			$results = $this->get_configured_root_server_request("client_interface/json/?switcher=GetServiceBodies");
 			$result = json_decode(wp_remote_retrieve_body($results), true);
@@ -926,37 +946,31 @@ function bmlt_meeting_list($atts = null, $content = null) {
 				array_splice($result_meetings, array_search($today_str, $days)),
 				array_splice($result_meetings, 0)
 			);
-
-			foreach ($result_meetings as $value) {
+			$this->upgradeHeaderData();
+			$levels = $this->getHeaderLevels();
+			foreach ($result_meetings as &$value) {
 				$enFormats = explode ( ",", $value['formats'] );
 				if ( $this->options['include_asm'] == 0 && in_array ( $this->options['asm_format_key'], $enFormats ) ) { continue; }
-				$header_data = $this->getHeaderData($value);
-				if (!isset($headerMeetings[$header_data])) {
-					$unique_heading[] = $header_data;
-					$headerMeetings[$header_data] = array();
-				}
-				$headerMeetings[$header_data][] = $value;
-			}
-
-			if ($this->options['meeting_sort'] === 'weekday_area' || $this->options['meeting_sort'] === 'weekday_city' || $this->options['meeting_sort'] === 'weekday_county') {
-				usort($unique_heading,function($a,$b){
-					$a_parts = explode(',',$a);
-					$a_day = intval($a_parts[0]);
-					if ($a_day < intval($this->options['weekday_start']))
-						$a_day += 7;
-					$b_parts = explode(',',$b);
-					$b_day = intval($b_parts[0]);
-					if ($b_day < intval($this->options['weekday_start']))
-						$b_day += 7;
-					if ($a_day < $b_day) return -1;
-					if ($a_day > $b_day) return 1;
-					if ($a_parts[1] < $b_parts[1]) return -1;
-					if ($a_parts[1] > $b_parts[1]) return 1;
-					return 0;
-				});
-			} elseif ($this->options['meeting_sort'] !== 'day') {
-				asort($unique_heading, SORT_NATURAL | SORT_FLAG_CASE);
+				$value = $this->enhance_meeting($value, $this->options['weekday_language']);
+				$header1 = $this->getHeaderItem($value, 'header1');
+				if (!isset($headerMeetings[$header1])) {
+					$headerMeetings[$header1] = array();
+					if ($levels == 1) {
+						$headerMeetings[$header1][0] = array();
+					}
+				}
+				if ($levels == 2) {
+					$header2 = $this->getHeaderItem($value, 'header2');
+					if (!isset($headerMeetings[$header1][$header2])) {
+						$headerMeetings[$header1][$header2] = array();
+					}
+					$headerMeetings[$header1][$header2][] = $value;
+				} else {
+					$headerMeetings[$header1][0][] = $value;
+				}
 			}
+			$unique_heading = array_keys($headerMeetings);
+			asort($unique_heading, SORT_NATURAL | SORT_FLAG_CASE);
 			if ( $this->options['page_fold'] === 'full' || $this->options['page_fold'] === 'half' || $this->options['page_fold'] === 'flyer') {
 				$num_columns = 0;
 			} elseif ( $this->options['page_fold'] === 'tri' ) {
@@ -996,95 +1010,64 @@ function bmlt_meeting_list($atts = null, $content = null) {
 			$this->options['meeting_template_content'] = wpautop(stripslashes($this->options['meeting_template_content']));
 			$this->options['meeting_template_content'] = preg_replace('/[[:^print:]]/', ' ', $this->options['meeting_template_content']);
 
-			$groupByLevels = 1;			
-			if ( $this->options['meeting_sort'] === 'weekday_area' || $this->options['meeting_sort'] === 'weekday_city' || $this->options['meeting_sort'] === 'weekday_county' ) {
-				$groupByLevels = 2;	
-				$current_weekday = 0;
-			} elseif ( $this->options['meeting_sort'] === 'state') {
-				$groupByLevels = 2;
-				$current_major = '???';
-			}
 			$this->options['meeting_template_content'] = str_replace("&nbsp;", " ", $this->options['meeting_template_content']);
 			$analysedTemplate = $this->analyseTemplate($this->options['meeting_template_content']);
 			$first_meeting = true;
 			$newMajorHeading = false;
-			$header_string = '';
-			$current_major = '';
-			$current_weekday = 0;
 			$test_pages = deep_copy($this->mpdf);
-			foreach ($unique_heading as $this_heading) {
-				if ( $this->options['meeting_sort'] === 'weekday_area' || $this->options['meeting_sort'] === 'weekday_city' || $this->options['meeting_sort'] === 'weekday_county' ) {
-					$area_data = explode(',',$this_heading);
-					$weekday_tinyint = intval($area_data[0]);
-					if ( $weekday_tinyint !== $current_weekday ) {
-						$current_weekday = $weekday_tinyint;
-						$header_string = $this->getday($weekday_tinyint, false, $this->options['weekday_language']);
-						$newMajorHeading = true;
-					}
-					$subheader = $area_data[1];
-				} elseif ($groupByLevels == 2) {
-					$area_data = explode(',',$this_heading);
-					if ($this->options['meeting_sort'] === 'state') {
-						$header_string = $area_data[1].', '.$area_data[0];
-						$newMajorHeading = true;
-					} elseif ( $area_data[0] !== $current_major ) {
-						$current_major = $area_data[0];
-						$header_string = $area_data[0];
-						$newMajorHeading = true;
-					}
-					$subheader = $area_data[1];					
-				}
-				$newVal = true;
-
-				foreach ($headerMeetings[$this_heading] as $meeting_value) {	
-					$area_name = $this->get_area_name($meeting_value);		
-					$header = '';
-					$has_major_header = false;
-					if ( $groupByLevels == 2 ) {
-						if ( $newMajorHeading === true ) {
-							$xtraMargin = '';
-							if ( !$first_meeting ) {
-								$xtraMargin = 'margin-top:2pt;';
+			foreach ($unique_heading as $this_heading_raw) {
+				$newMajorHeading = true;
+				$this_heading = $this->remove_sort_key($this_heading_raw);
+				$unique_subheading = array_keys($headerMeetings[$this_heading_raw]);
+				asort($unique_subheading, SORT_NATURAL | SORT_FLAG_CASE);
+				foreach ($unique_subheading as $this_subheading_raw) {
+					$newSubHeading = true;		
+					$this_subheading = $this->remove_sort_key($this_heading_raw);
+					foreach ($headerMeetings[$this_heading_raw][$this_subheading_raw] as $meeting_value) {			
+						$header = '';
+						if ( !empty($this->options['combine_headings'])) {
+							$header_string =  $this->options['combine_headings'];
+							$header_string =  str_replace('header1',$this_heading, $header_string);
+							$header_string =  str_replace('header2',$this_subheading, $header_string);
+							$header .= "<div style='".$header_style."'>".$header_string."</div>";
+						} elseif ( $levels == 2 ) {
+							if ( $newMajorHeading === true ) {
+								$xtraMargin = '';
+								if ( !$first_meeting ) {
+									$xtraMargin = 'margin-top:2pt;';
+								}
+								$header .= '<div style="'.$header_style.$xtraMargin.'">'.$this_heading."</div>";
 							}
-							$header .= '<div style="'.$header_style.$xtraMargin.'">'.$header_string."</div>";
-							$newMajorHeading = false;
-							$has_major_header = true;
-						}
-						if ($newVal && $this->options['sub_header_shown']==1) {
-							$header .= "<p style='margin-top:1pt; padding-top:1pt; font-weight:bold;'>".$subheader."</p>";
+							if ($newSubHeading && $this->options['sub_header_shown']==1) {
+								$header .= "<p style='margin-top:1pt; padding-top:1pt; font-weight:bold;'>".$this_subheading."</p>";
+							}
+						} elseif ( $newMajorHeading === true ) {
+							$header .= "<div style='".$header_style."'>".$this_heading."</div>";
 						}
-					} else {
-						$header_string = $this_heading;
-						if ($this->options['meeting_sort'] === 'day') {
-							$header_string = $this->getday($this_heading, false, $this->options['weekday_language']);
-						} 
-						if ( $newVal ) {
-							$header .= "<div style='".$header_style."'>".$header_string."</div>";
-							$has_major_header = true;
+						if ($this->options['suppress_heading']==1) {
+							$header = '';
 						}
-					}
-					if ($this->options['suppress_heading']==1) {
-						$header = '';
-					}
-					$data = $header . $this->write_single_meeting($meeting_value, 
-						$this->options['meeting_template_content'], $analysedTemplate,
-						$area_name, $this->options['weekday_language']);											
-					$data = mb_convert_encoding($data, 'HTML-ENTITIES');						
-					$data = utf8_encode($data);
-					$this->writeBreak($test_pages);
-					$y_startpos = $test_pages->y;
-					$test_pages->WriteHTML($data);
-					$y_diff = $test_pages->y - $y_startpos;
-					if ($y_diff >= $this->mpdf->h - ($this->mpdf->y + $this->mpdf->bMargin + 5) - $this->mpdf->kwt_height) {
-						$this->writeBreak($this->mpdf);
-						if (!$has_major_header && $this->options['cont_header_shown']) {
-							$header = "<div style='".$header_style."'>".$header_string." " . $cont . "</div>";
-							$data = $header.$data;
+						$data = $header . $this->write_single_meeting($meeting_value, 
+							$this->options['meeting_template_content'], $analysedTemplate,
+							$meeting_value['area_name']);											
+						$data = mb_convert_encoding($data, 'HTML-ENTITIES');						
+						$data = utf8_encode($data);
+						$this->writeBreak($test_pages);
+						$y_startpos = $test_pages->y;
+						$test_pages->WriteHTML($data);
+						$y_diff = $test_pages->y - $y_startpos;
+						if ($y_diff >= $this->mpdf->h - ($this->mpdf->y + $this->mpdf->bMargin + 5) - $this->mpdf->kwt_height) {
+							$this->writeBreak($this->mpdf);
+							if (!$newMajorHeading && $this->options['cont_header_shown']) {
+								$header = "<div style='".$header_style."'>".$this_heading." " . $cont . "</div>";
+								$data = $header.$data;
+							}
 						}
+						$this->mpdf->WriteHTML($data);
+						$first_meeting = false;
+						$newSubHeading = false;
+						$newMajorHeading = false;
 					}
-					$this->mpdf->WriteHTML($data);
-					$first_meeting = false;
-					$newVal = false;
 				}
 			}
 
@@ -1230,6 +1213,15 @@ function bmlt_meeting_list($atts = null, $content = null) {
 			$this->mpdf->Output($FilePath,'I');
 			exit;
 		}
+		function remove_sort_key($this_heading) {
+			if (mb_substr($this_heading,0,1)=='[') {
+				$end = strpos($this_heading,']');
+				if ($end>0) {
+					return trim(substr($this_heading,$end+1));
+				}
+			}
+			return $this_heading;
+		}
 		function writeBreak($mpdf) {
 			if ( $this->options['page_fold'] === 'half' || $this->options['page_fold'] === 'full' ) {
 				$mpdf->WriteHTML("<pagebreak>");
@@ -1251,53 +1243,86 @@ function addColumnSeparators($oh) {
 					</table>');
 			}
 		}
-		function addSuffix($str,$suffix,$empty) {
-			if (strlen(trim($str))==0) {
-				return $empty;
+		function getHeaderLevels() {
+			if (!empty($this->options['header2'])) {
+				return 2;
+			}
+			return 1;
+		}
+		function getHeaderItem($value,$name) {
+			if (empty($this->options[$name])) {
+					return '';
+			}
+			$header1 = '';
+			if ($this->options[$name]=='service_body_bigint') {
+				foreach($this->unique_areas as $unique_area){
+					$area_data = explode(',',$unique_area);
+					$area_name = $area_data[0];
+					$area_id = $area_data[1];
+					if ( $area_id === $value['service_body_bigint'] ) {
+						return $area_name;
+					}
+				}
+				return 'Area not found';
+			} elseif ($this->options[$name]=='day') {
+				$off = intval($this->options['weekday_start']);
+				$day = intval($value['weekday_tinyint']);
+				if ($day < $off) $day = $day + 7;
+				return '['.str_pad($day, 2, '0', STR_PAD_LEFT).']'.$value['day'];
+			} elseif (isset($value[$this->options[$name]])) {
+				$header1 = $value[$this->options[$name]];
+			}
+			$alt = '';
+			if ($header1==''
+				&& !empty($this->options[$name.'_alt'])
+			    && isset($value[$this->options[$name.'_alt']])) {
+				$header1 = $value[$this->options[$name.'_alt']];
+				$alt = '_alt';
+			}
+			if (strlen(trim($header1))==0) {
+				return 'NO DATA';
 			}
-			if (strlen($suffix)>0) {
-				return $str.' '.$suffix;
+			if (strlen($this->options[$name.$alt.'_suffix'])>0) {
+				return $header1.' '.$this->options[$name.$alt.'_suffix'];
 			}
-			return $str;
+			return $header1;
 		}
-		function getHeaderData($value) {
+		function upgradeHeaderData() {
 			if ( $this->options['meeting_sort'] === 'state' ) {
-				return  $this->addSuffix($value['location_province']. ', '.$value['location_municipality'],'','[NO STATE DATA]');
+				$this->options['header1'] = 'location_province';
+				$this->options['header2'] = 'location_municipality';
+				$this->options['combine_headings'] = 'header2, header1';
 			} elseif ( $this->options['meeting_sort'] === 'city' ) {
-				return strtoupper($value['location_municipality']);
+				$this->options['header1'] = 'location_municipality';
 			} elseif ( $this->options['meeting_sort'] === 'borough' ) {
-				return $this->addSuffix($value['location_city_subsection'],$this->options['borough_suffix'],'[NO BOROUGH DATA]');
+				$this->options['header1'] = 'location_city_subsection';
+				$this->options['header1_suffix'] = $this->options['borough_suffix'];
 			} elseif ( $this->options['meeting_sort'] === 'county' ) {
-				return $this->addSuffix($value['location_sub_province'],$this->options['county_suffix'],'[NO COUNTY DATA]');
+				$this->options['header1'] = 'location_sub_province';
+				$this->options['header1_alt_suffix'] = $this->options['county_suffix'];
 			} elseif ( $this->options['meeting_sort'] === 'borough_county' ) {
-				if ( $value['location_city_subsection'] !== '' ) {
-					return $this->addSuffix($value['location_city_subsection'],$this->options['borough_suffix'],'[NO BOROUGH DATA]');;
-				} else {
-					return $this->addSuffix($value['location_sub_province'],$this->options['county_suffix'],'[NO COUNTY DATA]');
-				}
+				$this->options['header1'] = 'location_city_subsection';
+				$this->options['header1_suffix'] = $this->options['borough_suffix'];
+				$this->options['header1_alt'] = 'location_sub_province';
+				$this->options['header1_alt_suffix'] = $this->options['county_suffix'];
 			} elseif ( $this->options['meeting_sort'] === 'neighborhood_city' ) {
-				if ( $value['location_neighborhood'] !== '' ) {
-					return $this->addSuffix($value['location_neighborhood'],$this->options['neighborhood_suffix'],'');
-				} else {
-					return $this->addSuffix($value['location_municipality'],$this->options['city_suffix'],'[NO NEIGHBORHOOD OR CITY DATA]');
-				}
+				$this->options['header1'] = 'location_neighborhood';
+				$this->options['header1_suffix'] = $this->options['neighborhood_suffix'];
+				$this->options['header1_alt'] = 'location_municipality';
+				$this->options['header1_alt_suffix'] = $this->options['city_suffix'];
 			} elseif ( $this->options['meeting_sort'] === 'group' ) {
-				return $value['meeting_name'];
+				$this->options['header1'] = 'meeting_name';
 			} elseif ( $this->options['meeting_sort'] === 'weekday_area' ) {
-				foreach($this->unique_areas as $unique_area){
-					$area_data = explode(',',$unique_area);
-					$area_name = $area_data[0];
-					$area_id = $area_data[1];
-					if ( $area_id === $value['service_body_bigint'] ) {
-						return $value['weekday_tinyint'] . ',' . $area_name . ',' . $area_id;
-					}
-				}
+				$this->options['header1'] = 'day';
+				$this->options['header2'] = 'service_body_bigint';
 			} elseif ( $this->options['meeting_sort'] === 'weekday_city' ) {
-				return $value['weekday_tinyint'] . ',' . $value['location_municipality'];
+				$this->options['header1'] = 'day';
+				$this->options['header2'] = 'location_municipality';
 			} elseif ( $this->options['meeting_sort'] === 'weekday_county' ) {
-				return $value['weekday_tinyint'] . ',' . $value['location_sub_province'];
+				$this->options['header1'] = 'day';
+				$this->options['header2'] = 'location_sub_province';
 			} else {
-				return $value['weekday_tinyint'];
+				$this->options['header1'] = 'day';
 			}
 		}
 		function get_area_name($meeting_value) {
@@ -1344,7 +1369,7 @@ function analyseTemplate($template) {
 			}
 			return $ret;
 		}
-		function write_single_meeting($meeting_value, $template, $analysedTemplate, $area_name, $lang) {
+		function enhance_meeting(&$meeting_value, $lang) {
 			$duration = explode(':', $meeting_value['duration_time']);
 			$minutes = intval($duration[0])*60 + intval($duration[1]) + intval($duration[2]);
 			$meeting_value['duration_m'] = $minutes;
@@ -1404,7 +1429,9 @@ function write_single_meeting($meeting_value, $template, $analysedTemplate, $are
 			$meeting_value['area_name'] = $area_name;
 			$meeting_value['area_i'] = substr($area_name, 0, 1);
 			// Extensions.
-			$meeting_value = apply_filters("Bread_Enrich_Meeting_Data", $meeting_value, $this->formats_by_key[$lang]);
+			return apply_filters("Bread_Enrich_Meeting_Data", $meeting_value, $this->formats_by_key[$lang]);
+		}
+		function write_single_meeting($meeting_value, $template, $analysedTemplate, $area_name) {
 			$data = $template;
 			$namedValues = array();
 			foreach($meeting_value as $field=>$notUsed) {
@@ -1659,8 +1686,9 @@ function write_service_meetings($font_size, $line_height) {
 				$area_name = $this->get_area_name($meeting_value);
 				if ($template != '') {
 					$template = str_replace("&nbsp;", " ", $template);
+					$value = $this->enhance_meeting($value, $this->options['asm_language']);
 					$data .= $this->write_single_meeting($value, $template, $this->analyseTemplate($template),
-						$area_name, $this->options['asm_language']);
+						$area_name);
 					continue;
 				}
 				$display_string = '<strong>'.$value['meeting_name'].'</strong>';
diff --git a/includes/three_column_settings.json b/includes/three_column_settings.json
index a998b5b..1a807d9 100644
--- a/includes/three_column_settings.json
+++ b/includes/three_column_settings.json
@@ -1 +1 @@
-{"root_server":"","service_body_1":"","service_body_2":"Not Used","service_body_3":"Not Used","header_font_size":6.5,"area_service_meetings":null,"front_page_content":"<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><img src=\"https:\/\/bmlt.app\/wp-content\/uploads\/2018\/10\/default_nalogo.jpg\" alt=\"default_nalogo\" \/><\/p>\r\n<p>&nbsp;<\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 15pt\"><strong>[service_body_1]<\/strong><\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 15pt\"><strong>MEETING LIST<\/strong><\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 15pt\"><strong>[date]<\/strong>\u00a0<\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 14pt\"><b>24 HOUR HELPLINE<\/b><\/span><\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 14pt\">NUMBER <br \/><\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><strong>\u00a0<\/strong><\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><b>https:\/\/na.org<\/b><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 12pt\"><strong>SUGGESTIONS FOR EVERYONE<\/strong><\/span><\/p>\r\n<p style=\"text-align: center\"><strong>DON\\'T USE no matter what<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Ask your Higher Power to keep you clean<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Come early and stay late<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Get a home group<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Go to 90 meetings in 90 days<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Read NA literature daily<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Get and use a sponsor<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Use the PHONE<\/strong><\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 12pt\"><strong>KEEP COMING BACK. IT WORKS<\/strong><\/span><\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">Meetings Weekly:\u00a0[meeting_count]<\/p>","front_line_height":"1.0","area_service_meetings_line_height":null,"content_font_size":6,"content_line_height":1.2,"front_page_font_size":10,"last_page_content":"","front_page_line_height":"1.0","last_page_line_height":1,"page_layout":null,"service_body_4":"Not Used","service_body_5":"Not Used","time_option":1,"remove_space":true,"helplines_font_size":null,"format_codes":null,"format_codes_font_size":null,"format_codes_line_height":null,"page_size":"letter","page_fold":"tri","meeting_sort":"day","cache_time":0,"page_orientation":"L","show_status":null,"use_custom_section":null,"custom_section_content":"<p>[new_column]<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">MEETING FORMAT LEGEND<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p>[format_codes_used_basic]<\/p>\r\n<p>&nbsp;<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">HELPLINES<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<table style=\"width: 100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\r\n<tbody>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\">Area 1<\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\">Number 1<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\">Area 2<\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\">Number 2<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\"><\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\"><\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\"><\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\"><\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\"><\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\"><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p>&nbsp;<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">SERVICE MEETINGS<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p>[service_meetings]<\/p>\r\n<p>[new_column]<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">PHONE NUMBERS<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<table style=\"width: 100%\" cellspacing=\"10\" cellpadding=\"10\">\r\n<tbody>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">\u00a0<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\"><span style=\"font-size: 13pt\">What is our message?<\/span><\/span><\/strong><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">The message is that an addict, <\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">any addict,\u00a0<\/span><\/strong><strong><span style=\"font-size: 11pt\">can stop using drugs,<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">\u00a0<\/span><\/strong><strong><span style=\"font-size: 11pt\">lose the desire to use,<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">and find a new way to live.<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">Our message is hope<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\"> and the promise of freedom.\u00a0<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 9pt\">Basic Text<\/span><em><span style=\"font-size: 9pt\">, page 65<\/span><\/em><\/p>\r\n<p>[new_column]<\/p>","custom_section_line_height":1,"area_service_meetings_font_size":null,"which_format_codes":null,"custom_section_font_size":6.5,"include_meeting_email":false,"bmlt_login_id":"","bmlt_login_password":"","last_page_font_size":10,"column_line":false,"used_format_1":"","time_clock":"12","column_gap":6,"margin_right":2,"margin_left":2,"margin_bottom":2,"margin_top":2,"meeting_template_content":"<div style=\"margin-top: 0px; width: 100%; padding: 0px; border-bottom: 1px solid #AAA;\"><span style=\"width: 11%; vertical-align: top; text-align: center;\"><span style=\"font-family: courier;\"><strong>time<\/strong><\/span><\/span> <span style=\"width: 2pt; vertical-align: top; text-align: center;\">\u00A0<\/span> <span style=\"width: 8%; vertical-align: top; text-align: center;\"><span style=\"font-family: courier;\"><strong>hrsHR<\/strong><\/span><\/span> <span style=\"width: 4pt; vertical-align: top; text-align: center;\">\u00A0<\/span><strong>group<\/strong>, location,\u00A0info,\u00A0street, city, state, zip <strong>(formats)<\/strong>\u00A0<em>comments<\/em><\/div>","col_color":"#274fae","header_text_color":"#ffffff","header_background_color":"#000000","header_uppercase":1,"header_bold":1,"include_asm":false,"weekday_language":"both","sub_header_shown":1,"borough_suffix":"Borough","county_suffix":"County","neighborhood_suffix":"Neighborhood","city_suffix":"City","pagenumbering_font_size":9,"recurse_service_bodies":1,"extra_meetings_enabled":0,"include_protection":false,"base_font":"dejavusanscondensed","protection_password":"","custom_query":"","extra_meetings":["none"]}
+{"root_server":"","service_body_1":"","service_body_2":"Not Used","service_body_3":"Not Used","header_font_size":6.5,"area_service_meetings":null,"front_page_content":"<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><img src=\"https:\/\/bmlt.app\/wp-content\/uploads\/2018\/10\/default_nalogo.jpg\" alt=\"default_nalogo\" \/><\/p>\r\n<p>&nbsp;<\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 15pt\"><strong>[service_body_1]<\/strong><\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 15pt\"><strong>MEETING LIST<\/strong><\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 15pt\"><strong>[date]<\/strong>\u00a0<\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 14pt\"><b>24 HOUR HELPLINE<\/b><\/span><\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 14pt\">NUMBER <br \/><\/span><\/p>\r\n<p>&nbsp;<\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><strong>\u00a0<\/strong><\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><b>https:\/\/na.org<\/b><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 12pt\"><strong>SUGGESTIONS FOR EVERYONE<\/strong><\/span><\/p>\r\n<p style=\"text-align: center\"><strong>DON\\'T USE no matter what<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Ask your Higher Power to keep you clean<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Come early and stay late<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Get a home group<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Go to 90 meetings in 90 days<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Read NA literature daily<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Get and use a sponsor<\/strong><\/p>\r\n<p style=\"text-align: center\"><strong>Use the PHONE<\/strong><\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 12pt\"><strong>KEEP COMING BACK. IT WORKS<\/strong><\/span><\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\">Meetings Weekly:\u00a0[meeting_count]<\/p>","front_line_height":"1.0","area_service_meetings_line_height":null,"content_font_size":6,"content_line_height":1.2,"front_page_font_size":10,"last_page_content":"","front_page_line_height":"1.0","last_page_line_height":1,"page_layout":null,"service_body_4":"Not Used","service_body_5":"Not Used","time_option":1,"remove_space":true,"helplines_font_size":null,"format_codes":null,"format_codes_font_size":null,"format_codes_line_height":null,"page_size":"letter","page_fold":"tri","meeting_sort":"day","cache_time":0,"page_orientation":"L","show_status":null,"use_custom_section":null,"custom_section_content":"<p>[new_column]<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">MEETING FORMAT LEGEND<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p>[format_codes_used_basic]<\/p>\r\n<p>&nbsp;<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">HELPLINES<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<table style=\"width: 100%\" border=\"0\" cellspacing=\"0\" cellpadding=\"0\">\r\n<tbody>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\">Area 1<\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\">Number 1<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\">Area 2<\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\">Number 2<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\"><\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\"><\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\"><\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\"><\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom: 1px solid #555\"><\/td>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #555555;text-align: right\"><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p>&nbsp;<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">SERVICE MEETINGS<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p>[service_meetings]<\/p>\r\n<p>[new_column]<\/p>\r\n<table style=\"width: 100%\">\r\n<tbody>\r\n<tr>\r\n<td style=\"padding: 2pt;text-align: center;background-color: #000000\"><span style=\"font-size: 7pt\"><strong><span style=\"color: #fff\">PHONE NUMBERS<\/span><\/strong><\/span><\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<table style=\"width: 100%\" cellspacing=\"10\" cellpadding=\"10\">\r\n<tbody>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<tr>\r\n<td style=\"border-bottom-width: 1px;border-bottom-style: solid;border-bottom-color: #111111\">\u00a0<\/td>\r\n<\/tr>\r\n<\/tbody>\r\n<\/table>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">\u00a0<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\"><span style=\"font-size: 13pt\">What is our message?<\/span><\/span><\/strong><\/p>\r\n<p>&nbsp;<\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">The message is that an addict, <\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">any addict,\u00a0<\/span><\/strong><strong><span style=\"font-size: 11pt\">can stop using drugs,<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">\u00a0<\/span><\/strong><strong><span style=\"font-size: 11pt\">lose the desire to use,<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">and find a new way to live.<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\">Our message is hope<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\"><strong><span style=\"font-size: 11pt\"> and the promise of freedom.\u00a0<\/span><\/strong><\/p>\r\n<p style=\"text-align: center\">\u00a0<\/p>\r\n<p style=\"text-align: center\"><span style=\"font-size: 9pt\">Basic Text<\/span><em><span style=\"font-size: 9pt\">, page 65<\/span><\/em><\/p>\r\n<p>[new_column]<\/p>","custom_section_line_height":1,"area_service_meetings_font_size":null,"which_format_codes":null,"custom_section_font_size":6.5,"include_meeting_email":false,"bmlt_login_id":"","bmlt_login_password":"","last_page_font_size":10,"column_line":false,"used_format_1":"","time_clock":"12","column_gap":6,"margin_right":2,"margin_left":2,"margin_bottom":2,"margin_top":2,"meeting_template_content":"<div style=\"margin-top: 0px; width: 100%; padding: 0px; border-bottom: 1px solid #AAA;\"><span style=\"width: 11%; vertical-align: top; text-align: center;\"><span style=\"font-family: courier;\"><strong>time<\/strong><\/span><\/span> <span style=\"width: 2pt; vertical-align: top; text-align: center;\">\u00A0<\/span> <span style=\"width: 8%; vertical-align: top; text-align: center;\"><span style=\"font-family: courier;\"><strong>[hrs]HR<\/strong><\/span><\/span> <span style=\"width: 4pt; vertical-align: top; text-align: center;\">\u00A0<\/span><strong>group<\/strong>, location,\u00A0info,\u00A0street, city, state, zip <strong>(formats)<\/strong>\u00A0<em>comments<\/em><\/div>","col_color":"#274fae","header_text_color":"#ffffff","header_background_color":"#000000","header_uppercase":1,"header_bold":1,"include_asm":false,"weekday_language":"both","sub_header_shown":1,"borough_suffix":"Borough","county_suffix":"County","neighborhood_suffix":"Neighborhood","city_suffix":"City","pagenumbering_font_size":9,"recurse_service_bodies":1,"extra_meetings_enabled":0,"include_protection":false,"base_font":"dejavusanscondensed","protection_password":"","custom_query":"","extra_meetings":["none"]}
diff --git a/js/bmlt_meeting_list.js b/js/bmlt_meeting_list.js
index f076e48..5cd6e64 100644
--- a/js/bmlt_meeting_list.js
+++ b/js/bmlt_meeting_list.js
@@ -401,10 +401,19 @@ var $ml = jQuery.noConflict
          $ml('.neighborhood_by_suffix').show();
          $ml('.city_by_suffix').show();
 	 }
+	 var user_defined_sub = false;
+	 $ml('.user_defined_headings').hide();
+	 if (meeting_sort_val === 'user_defined') {
+		$ml('.user_defined_headings').show();
+		if ($ml("#heading2").val()!='') {
+			user_defined_sub = true;
+		}
+	}
 	 if (meeting_sort_val == 'weekday_area'
 	 ||  meeting_sort_val == 'weekday_city'
 	 ||  meeting_sort_val == 'weekday_county' 
-	 ||  meeting_sort_val == 'state') {
+	 ||  meeting_sort_val == 'state'
+	 ||  user_defined_sub) {
 		 $ml('.show_subheader').show();
 	 } else {
 		 $ml('.show_subheader').hide();
@@ -440,6 +449,14 @@ var $ml = jQuery.noConflict
 			$ml('.neighborhood_by_suffix').show();
 			$ml('.city_by_suffix').show();
 		}
+		var user_defined_sub = false;
+		$ml('.user_defined_headings').hide();
+		if (meeting_sort_val === 'user_defined') {
+		   $ml('.user_defined_headings').show();
+		   if ($ml("#heading2").val()!='') {
+			   user_defined_sub = true;
+		   }
+	   }
 		if (meeting_sort_val == 'weekday_area'
 		||  meeting_sort_val == 'weekday_city'
 		||  meeting_sort_val == 'weekday_county' 
diff --git a/partials/_backup_restore_setup.php b/partials/_backup_restore_setup.php
index 3eb12a7..c35f19f 100644
--- a/partials/_backup_restore_setup.php
+++ b/partials/_backup_restore_setup.php
@@ -8,7 +8,7 @@
             <div id="exportdiv" class="postbox">
             <h3 class="hndle">Configuration Manager</h3>
                 <div class="inside">
-                    <p><?php _e( 'bread can support meeting lists.  Each meeting list has an integer ID and a text description that help the user to identify ' ); ?>
+                    <p><?php _e( 'bread can support multiple meeting lists.  Each meeting list has an integer ID and a text description that help the user to identify ' ); ?>
                        <?php _e( 'the configuration (or \'settings\') that will be used to generate the meeting list.  The ID of the configuration is used in the link ' );?>
                        <?php _e( 'that generates the meeting list (eg, ?current-meeting-list=2 generates the meeting list with ID 2.')?></p>
                     <h4>Current Meeting List</h4>
diff --git a/partials/_meetings_setup.php b/partials/_meetings_setup.php
index 505f4ee..03703c5 100644
--- a/partials/_meetings_setup.php
+++ b/partials/_meetings_setup.php
@@ -62,6 +62,7 @@
                                 <option <?php echo ($this->options['meeting_sort'] == 'weekday_area' ? 'selected="selected"' : '') ?> value="weekday_area">Weekday+Area</option>
                                 <option <?php echo ($this->options['meeting_sort'] == 'weekday_city' ? 'selected="selected"' : '') ?> value="weekday_city">Weekday+City</option>
                                 <option <?php echo ($this->options['meeting_sort'] == 'weekday_county' ? 'selected="selected"' : '') ?> value="weekday_county">Weekday+County</option>
+                                <option <?php echo ($this->options['meeting_sort'] == 'user_defined' ? 'selected="selected"' : '') ?> value="user_defined">User Defined</option>
                             </select>
                         </div>
                     <div class="borough_by_suffix">
@@ -99,6 +100,48 @@
 
                         </p>
                     </div>
+                    <div class="user_defined_headings">
+                        <p>
+                            <label for="heading1">Main Grouping: </label>
+                            <select id="heading1" name="heading1">					
+                                <option <?php echo ($this->options['heading1'] == 'day' ? 'selected="selected"' : '') ?> value="day">Weekday</option>
+                                <option <?php echo ($this->options['heading1'] == 'city' ? 'selected="selected"' : '') ?> value="city">City</option>
+                                <option <?php echo ($this->options['heading1'] == 'group' ? 'selected="selected"' : '') ?> value="group">Group</option>
+                                <option <?php echo ($this->options['heading1'] == 'county' ? 'selected="selected"' : '') ?> value="county">County</option>
+                                <option <?php echo ($this->options['heading1'] == 'borough' ? 'selected="selected"' : '') ?> value="borough">Borough</option>
+                                <option <?php echo ($this->options['heading1'] == 'state' ? 'selected="selected"' : '') ?> value="state">State</option>
+                                <?php
+                                    $fks = $this->get_nonstandard_fieldkeys();
+							        foreach ($fks as $fk) {
+                                        $selected = '';
+                                        if ($fk['key']==$this->options['heading1']) {
+                                            $selected = ' selected="selected"';
+                                        }
+									    echo '<option value="'.$fk['key'].'" '.$selected.'>'.$fk['description'].'</option>';
+                                    }
+						        ?>
+                            </select>
+                            <label for="heading2">Sub-Grouping: </label>
+                            <select id="heading2" name="heading2">
+                                <option <?php echo (empty($this->options['heading2']) ? 'selected="selected"' : '') ?> value="">None</option>
+                                <option <?php echo ($this->options['heading2'] == 'day' ? 'selected="selected"' : '') ?> value="day">Weekday</option>
+                                <option <?php echo ($this->options['heading2'] == 'city' ? 'selected="selected"' : '') ?> value="city">City</option>
+                                <option <?php echo ($this->options['heading2'] == 'group' ? 'selected="selected"' : '') ?> value="group">Group</option>
+                                <option <?php echo ($this->options['heading2'] == 'county' ? 'selected="selected"' : '') ?> value="county">County</option>
+                                <option <?php echo ($this->options['heading2'] == 'borough' ? 'selected="selected"' : '') ?> value="borough">Borough</option>
+                                <option <?php echo ($this->options['heading2'] == 'state' ? 'selected="selected"' : '') ?> value="state">State</option>
+                                <?php
+							        foreach ($fks as $fk) {
+                                        $selected = '';
+                                        if ($fk['key']==$this->options['heading2']) {
+                                            $selected = ' selected="selected"';
+                                        }
+									    echo '<option value="'.$fk['key'].'" '.$selected.'>'.$fk['description'].'</option>';
+                                    }
+						        ?>
+                            </select>
+                        </p>
+                    </div>
                     <div class="show_subheader">
                         <p>
                             <input name="sub_header_shown" value="0" type="hidden">