diff --git a/inc/people-grid.php b/inc/people-grid.php
index 23ce530..6093e50 100644
--- a/inc/people-grid.php
+++ b/inc/people-grid.php
@@ -2,32 +2,32 @@
 $the_query = new WP_Query( $args );
 if ( $the_query->have_posts() ) { ?>
 	<div class="row">
-		<?php 
+		<?php
 		$person_count=1;
 		while ( $the_query->have_posts() ) {
 			$the_query->the_post();
-			
-			
+
+
 			?>
-			
-			
-			
-			
-			
-			
-			
+
+
+
+
+
+
+
 			<div class="col-sm-3 personcount-<?php echo $person_count ?>" id="person-<?php echo get_the_id(); ?>">
 				<div class="person">
-						<?php 
-						
+						<?php
+
 						echo '<a href="'. get_the_permalink().'" class="person-permalink">';
-						
+
 						if (in_array('photo', $information_to_display)) {
 							 echo '<div class="person-image">';
 								the_post_thumbnail('large');
 							echo '</div>';
 						};
-						
+
 						if (in_array('first_name', $information_to_display) || in_array('middle_name', $information_to_display) || in_array('last_name', $information_to_display)){
 							echo '<h4 class="person-name">';
 								if (in_array('first_name', $information_to_display)) {
@@ -42,14 +42,17 @@
 									the_field('last_name');
 								};
 							echo '</h4>';
-						};									
-						
+						};
+
 						echo '</a>';
-						
+
 						if (in_array('title', $information_to_display)) {
-							echo '<p class="person-title"><strong>';
-								the_field('title');
-							echo '</strong></p>';
+							echo '<p class="person-title">';
+							$titlePieces = explode(";", get_field('title'));
+							foreach( $titlePieces as $t ){
+								echo ( !empty($t) ? "<strong>{$t}</strong><br>": "" );
+							}
+							echo '</p>';
 						};
 						if (in_array('about', $information_to_display)) {
 							echo '<div class="person-about">';
@@ -63,7 +66,7 @@
 								echo '<p class="person-file">';
 									echo '<a href="'.$file[url].'">'.$file[title].'</a>';
 								echo '</p>';
-							}						
+							}
 						};
 						if (in_array('email', $information_to_display)) {
 							echo '<p class="person-email">';
@@ -107,18 +110,17 @@
 						};	?>
 				</div><!-- /person -->
 			</div> <!-- /col -->
-	
-			<?php 
-			// check to see if we need to close this row... 
+
+			<?php
+			// check to see if we need to close this row...
 			if ($person_count % 4 == 0){
-				// if this is the 4th, 8th, 16th, etc person... 
-				echo '</div><!-- /row --><div class="row">';		
+				// if this is the 4th, 8th, 16th, etc person...
+				echo '</div><!-- /row --><div class="row">';
 			}
-			$person_count++;		
+			$person_count++;
 		} //end of posts?>
 		</div><!-- last row -->
-<?php 
+<?php
 } else {
 	// no posts found
 }; ?>
-	
\ No newline at end of file
diff --git a/inc/people-table.php b/inc/people-table.php
index c7b1068..2aab3c2 100644
--- a/inc/people-table.php
+++ b/inc/people-table.php
@@ -1,18 +1,18 @@
 <?php
 $the_query = new WP_Query( $args );
 if ( $the_query->have_posts() ) {
-	
-	// how many columns? Based on what they chose to display. 
-	
+
+	// how many columns? Based on what they chose to display.
+
 	$num_cols = count($information_to_display);
 	//var_dump($num_cols);
-	
+
 	?>
 	<table class="table table-striped">
 		<legend class="sr-only">List of People</legend>
 		<thead>
 			<tr>
-				<?php 
+				<?php
 				$nameCell = false;
 				foreach($information_to_display as $value){
 					if ($value == 'first_name' || $value == 'middle_name' || $value == 'last_name'){
@@ -33,34 +33,34 @@
 			</tr>
 		</thead>
 		<tbody>
-		<?php 
+		<?php
 		//var_dump($information_to_display);
-		
-		
-		
+
+
+
 		while ( $the_query->have_posts() ) {
 			$the_query->the_post();
-			
-				/* 
-					create a row. 
-									
-					For each possible field. 
-					
-					Check to see if it's within the $information_to_display array. 
-					
+
+				/*
+					create a row.
+
+					For each possible field.
+
+					Check to see if it's within the $information_to_display array.
+
 					If it is, create a <td>
-					
-					IF any values are found to match, dump those out. 
-					
-					After all possible fields, close the row. 
-				
+
+					IF any values are found to match, dump those out.
+
+					After all possible fields, close the row.
+
 				*/
-				
-				
-				
-				
+
+
+
+
 				echo '<tr>';
-				
+
 				if (in_array('photo', $information_to_display)) {
 					echo '<td class="person-image"><a href="'.get_the_permalink().'">';
 						the_post_thumbnail(array('65', '65'));
@@ -81,7 +81,15 @@
 					};
 					echo '</a></td>';
 				}
-				createTextCell('title', 'title');
+				//createTextCell('title', 'title');
+				if (in_array('title', $information_to_display)) {
+					echo '<td class="person-title">';
+					$titlePieces = explode(";", get_field('title'));
+					foreach( $titlePieces as $t ){
+						echo ( !empty($t) ? "<strong>{$t}</strong><br>": "" );
+					}
+					echo '</td>';
+				}
 				createTextCell('about', 'about');
 				if (in_array('file', $information_to_display)) {
 					echo '<td class="person-file">';
@@ -101,18 +109,18 @@
 				createTextCell('office_location', 'office_location');
 				createTextCell('office_hours', 'office_hours');
 				createTextCell('courses', 'courses');
-				
 
-				
+
+
 			echo '</tr>';
-			
-				
-				
+
+
+
 			} //end of posts?>
 		</tbody>
 	</table>
-	
-	<?php 
+
+	<?php
 } else {
 	// no posts found
 }; ?>
\ No newline at end of file
diff --git a/user-people.php b/user-people.php
index d37532e..81a8e7f 100644
--- a/user-people.php
+++ b/user-people.php
@@ -1,8 +1,8 @@
 <?php
 /**
 Template Name: People
- * This page template has no padding, and does not display the page title. 
- *	Useful for large images, iframes, or other edge cases. 
+ * This page template has no padding, and does not display the page title.
+ *	Useful for large images, iframes, or other edge cases.
  */
 
 get_header(); ?>
@@ -24,9 +24,9 @@
 										<?php edit_post_link( __( 'Edit', 'cs' ), '<span class="edit-link">', '</span>' ); ?>
 									</footer><!-- .entry-footer -->
 									<div class="uc-people">
-										<?php 
-											// everything we'll be doing will go into the args for WP_query. 
-											
+										<?php
+											// everything we'll be doing will go into the args for WP_query.
+
 											//$args = array('post_type=person');
 											$args = array(
 												'posts_per_page'   => -1,
@@ -34,12 +34,12 @@
 												'meta_key'			=> 'last_name',
 												'orderby'			=> 'menu_order meta_value title',
 												'order'  			 => 'ASC',
-											);					
-											
-											
-											
+											);
+
+
+
 											// Settings
-											
+
 											$layout = get_field( "layout" );
 											$people_to_display = get_field( "people_to_display" );
 											$break_into_groups = get_field( "break_into_groups" );
@@ -47,7 +47,9 @@
 											$specific_groups = get_field( "specific_groups" );
 											$specific_tags = get_field( "specific_tags" );
 											$information_to_display = get_field( "information_to_display" );
-																						
+
+											//var_dump($specific_people);
+
 											function createTextCell($setting, $field){
 												global $information_to_display;
 												if (in_array($setting, $information_to_display)) {
@@ -56,33 +58,36 @@ function createTextCell($setting, $field){
 													echo '</td>';
 												}
 											};
-											
-											
-								
+
+
+
 											if ($specific_people){
 												global $specific_people;
 												global $args;
 												$post__in = array();
 												foreach($specific_people as &$value){
-												  array_push($post__in, $value->ID);
+												  //array_push($post__in, $value->ID);
+												  array_push($post__in, $value);
 												}
 												$args[post__in]= $post__in;
 											}
-											
+
 											// do we need a tax query?
-											if ($specific_groups != false || $specific_tags != false){ 
-												
-												$tax_query = array();		
-																																	
+											if ($specific_groups != false || $specific_tags != false){
+
+												$tax_query = array();
+												$isTagSet = false;
+
 												if ($specific_groups != false) {
 													$group_query = array(
 														'taxonomy' => 'group',
 														'field'   	=> 'term_id',
 														'terms'		=> $specific_groups
 													);
-													array_push($tax_query, $group_query);													
+													array_push($tax_query, $group_query);
 												}
 												if ($specific_tags != false) {
+													$isTagSet = true;
 													$tag_query = array(
 														'taxonomy' => 'persontag',
 														'field'   	=> 'term_id',
@@ -91,22 +96,23 @@ function createTextCell($setting, $field){
 													array_push($tax_query, $tag_query);
 												}
 												$args[tax_query] = $tax_query;
-												
+
 											}
 											if ($break_into_groups == 1 ){
 												//echo '<h1>Break into Groups</h1>';
-												
+
 												// get all the people
 												$the_query = new WP_Query( $args );
-												
-												// focusing on just the people, not the rest of the query. 
+
+												// focusing on just the people, not the rest of the query.
 												$people = $the_query->posts;
-												
-												// look at each person, and see each group used, use that to create a list of terms. 
+
+												// look at each person, and see each group used, use that to create a list of terms.
 												$groups_in_use = array();
-												
+
 												foreach($people as $value){
-													$id = $value->ID;
+													//$id = $value->ID;
+													$id = $value;
 													$terms = get_the_terms($id, 'group');
 													if (is_array($terms)){
 														foreach($terms as $key => $value){
@@ -114,16 +120,16 @@ function createTextCell($setting, $field){
 															$slug = $value->slug;
 															$groups_in_use[$slug]= $slug;
 														}
-													};												
+													};
 												}
-												
+
 												// sort the groups in use alphabetically
 												sort($groups_in_use);
-												
-												// for each item in the list of terms, do a new query, but this time we're going to limit it to ONLY items from that one group. 
+
+												// for each item in the list of terms, do a new query, but this time we're going to limit it to ONLY items from that one group.
 												foreach($groups_in_use as $value){
-													
-													// this sets up the query we'll need, and will overwrite any group queries from the original settings. 
+
+													// this sets up the query we'll need, and will overwrite any group queries from the original settings.
 													$tax_query = array();
 													$group_query = array(
 														'taxonomy' => 'group',
@@ -131,33 +137,36 @@ function createTextCell($setting, $field){
 														'terms'		=> $value
 													);
 													array_push($tax_query, $group_query);
-													$args['tax_query'] = $tax_query;	
+													if( $isTagSet != false ){
+														array_push($tax_query, $tag_query);
+													}
+													$args['tax_query'] = $tax_query;
 
-													// with $arg updated, let's do a new query. 
+													// with $arg updated, let's do a new query.
 													echo '<h3 class="group-title">'.get_term_by('slug', $value, 'group')->name.'</h3>';
-													
+
 													if ($layout == 'grid') {
 														include('inc/people-grid.php');
 													}
 													if ($layout == 'table') {
 														include('inc/people-table.php');
 													}
-																																							
+
 												}
 
 											} else {
-												
+
 												if ($layout == 'grid') {
 													include('inc/people-grid.php');
 												}
 												if ($layout == 'table') {
 													include('inc/people-table.php');
 												}
-												
+
 											}
 										?>
-										
-									
+
+
 									</div>
 								</div><!-- .entry-content -->
 							</article><!-- #post-## -->
@@ -186,4 +195,4 @@ function adjustImages(){
 	adjustImages();
 });
 </script>
-<?php get_footer(); ?>
+<?php get_footer(); ?>
\ No newline at end of file