diff --git a/inc/fields/class-shortcode-ui-field-post-select.php b/inc/fields/class-shortcode-ui-field-post-select.php
index 0a62a26f..b2efc0a0 100644
--- a/inc/fields/class-shortcode-ui-field-post-select.php
+++ b/inc/fields/class-shortcode-ui-field-post-select.php
@@ -58,15 +58,15 @@ public function action_shortcode_ui_loaded_editor() {
 
 		?>
 
-		<script type="text/html" id="tmpl-shortcode-ui-field-post-select">
-			<div class="field-block shortcode-ui-field-post-select shortcode-ui-attribute-{{ data.attr }}">
-				<label for="{{ data.id }}">{{{ data.label }}}</label>
-				<select id="{{ data.id }}" name="{{ data.name }}" class="shortcode-ui-post-select" ></select>
-				<# if ( typeof data.description == 'string' && data.description.length ) { #>
-					<p class="description">{{{ data.description }}}</p>
-				<# } #>
-			</div>
-		</script>
+      <script type="text/html" id="tmpl-shortcode-ui-field-post-select">
+        <div class="field-block shortcode-ui-field-post-select shortcode-ui-attribute-{{ data.attr }}">
+          <label for="{{ data.id }}">{{{ data.label }}}</label>
+          <select id="{{ data.id }}" name="{{ data.name }}" class="shortcode-ui-post-select" ></select>
+          <# if ( typeof data.description == 'string' && data.description.length ) { #>
+            <p class="description">{{{ data.description }}}</p>
+            <# } #>
+        </div>
+      </script>
 
 		<?php
 	}
@@ -146,8 +146,9 @@ public function action_wp_ajax_shortcode_ui_post_field() {
 			$text = html_entity_decode( get_the_title( $post_id ) );
 
 			if ( $is_multiple_post_types && $post_type_obj ) {
-				$text .= sprintf( ' (%1$s)', $post_type_obj->labels->singular_name );
+				$text .= sprintf( '- %1$s (%2$s)', get_post_field( 'post_name', $post_id ), $post_type_obj->labels->singular_name );
 			}
+
 			array_push( $response['items'],
 				array(
 					'id'   => $post_id,
diff --git a/inc/fields/class-shortcode-ui-field-term-select.php b/inc/fields/class-shortcode-ui-field-term-select.php
index a6cb13d3..8e064d86 100644
--- a/inc/fields/class-shortcode-ui-field-term-select.php
+++ b/inc/fields/class-shortcode-ui-field-term-select.php
@@ -67,15 +67,15 @@ public function action_shortcode_ui_loaded_editor() {
 
 		?>
 
-		<script type="text/html" id="tmpl-shortcode-ui-field-term-select">
-			<div class="field-block shortcode-ui-field-term-select shortcode-ui-attribute-{{ data.attr }}">
-				<label for="{{ data.id }}">{{{ data.label }}}</label>
-				<select name="{{ data.attr }}" id="{{ data.id }}" class="shortcode-ui-term-select"></select>
-				<# if ( typeof data.description == 'string' && data.description.length ) { #>
-					<p class="description">{{{ data.description }}}</p>
-				<# } #>
-			</div>
-		</script>
+      <script type="text/html" id="tmpl-shortcode-ui-field-term-select">
+        <div class="field-block shortcode-ui-field-term-select shortcode-ui-attribute-{{ data.attr }}">
+          <label for="{{ data.id }}">{{{ data.label }}}</label>
+          <select name="{{ data.attr }}" id="{{ data.id }}" class="shortcode-ui-term-select"></select>
+          <# if ( typeof data.description == 'string' && data.description.length ) { #>
+            <p class="description">{{{ data.description }}}</p>
+            <# } #>
+        </div>
+      </script>
 
 		<?php
 	}
@@ -148,7 +148,10 @@ public function action_wp_ajax_shortcode_ui_term_field() {
 			$response['terms_per_page'] = 10;
 		}
 
-		$num_results = wp_count_terms( $taxonomy_type, $args );
+		// wp_count_terms relies on a string and uses the get_terms method anyway, so let's just cut to the chase
+		$num_results = get_terms( $taxonomy_type, array_merge( $args, [
+			'fields' => 'count',
+		] ) );
 
 		if ( empty( $num_results ) ) {
 			wp_send_json_error();
@@ -161,13 +164,29 @@ public function action_wp_ajax_shortcode_ui_term_field() {
 			$args['offset'] = ( $page - 1 ) * $response['items_per_page'];
 		}
 
+		$is_multiple_taxonomies = count( $args['taxonomy'] ) > 1;
+		$taxonomies = [];
+		if ( $is_multiple_taxonomies )
+		{
+			foreach ( $args['taxonomy'] as $tax_slug )
+			{
+				$taxonomies[ $tax_slug ] = get_taxonomy( $tax_slug );
+			}
+		}
+
 		$results = get_terms( $args );
 
 		foreach ( $results as $result ) {
+			$text = html_entity_decode( $result->name );
+
+			if ( $is_multiple_taxonomies ) {
+				$text .= sprintf( ' - %1%s (%2$s)', $result->slug, $taxonomies[ $result->taxonomy ]->labels->singular_name );
+			}
+
 			array_push( $response['items'],
 				array(
 					'id'   => $result->term_id,
-					'text' => html_entity_decode( $result->name ),
+					'text' => $text,
 				)
 			);
 		}