diff --git a/.gitignore b/.gitignore
index 40dde15f5f5..ba5c6788ca5 100644
--- a/.gitignore
+++ b/.gitignore
@@ -46,6 +46,7 @@ logs
 .idea/libraries/
 .idea/modules.xml
 .idea/dataSources.xml
+.idea/encodings.xml
 
 # Package Files
 *.jar
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
index c7d8cba3020..ed12c7eee38 100644
--- a/.idea/encodings.xml
+++ b/.idea/encodings.xml
@@ -5,6 +5,5 @@
     <file url="file://$PROJECT_DIR$/catalog-rest-service/src/main/resources" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/catalog-rest-service/src/main/resources/json/data" charset="UTF-8" />
     <file url="file://$PROJECT_DIR$/common/src/main/java" charset="UTF-8" />
-    <file url="file://$PROJECT_DIR$/openmetadata-ui/src/main/resources/ui/dist" charset="UTF-8" />
   </component>
 </project>
\ No newline at end of file
diff --git a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
index e7146e66fdd..97ef4e02f5a 100644
--- a/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
+++ b/catalog-rest-service/src/main/java/org/openmetadata/catalog/elasticsearch/ElasticSearchIndexDefinition.java
@@ -287,6 +287,7 @@ class ParseTags {
 @Value
 @JsonInclude(JsonInclude.Include.NON_NULL)
 class TableESIndex extends ElasticSearchIndex {
+
   @JsonProperty("table_id")
   String tableId;
 
@@ -323,6 +324,7 @@ class TableESIndex extends ElasticSearchIndex {
     String tableId = table.getId().toString();
     String tableName = table.getName();
     String description = table.getDescription() != null ? table.getDescription() : "";
+    String tableType = table.getTableType() != null ? table.getTableType().toString(): "Regular";
     List<String> tags = new ArrayList<>();
     List<String> columnNames = new ArrayList<>();
     List<String> columnDescriptions = new ArrayList<>();
@@ -361,7 +363,7 @@ class TableESIndex extends ElasticSearchIndex {
             .serviceCategory("databaseService")
             .columnNames(columnNames)
             .columnDescriptions(columnDescriptions)
-            .tableType(table.getTableType().toString())
+            .tableType(tableType)
             .tags(parseTags.tags)
             .tier(parseTags.tierTag);