diff --git a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java
index 5d163638d..59126da15 100644
--- a/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java
+++ b/search-api/search-core/src/main/java/org/sunbird/search/processor/SearchProcessor.java
@@ -935,8 +935,7 @@ private QueryBuilder getSearchQuery(SearchDTO searchDTO) {
 	}
 
 	private QueryBuilder getQuery(SearchDTO searchDTO) {
-		return searchDTO.isFuzzySearch() ? prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO);
-	}
-
+		return searchDTO.isFuzzySearch() ? (prepareSearchQuery(searchDTO) == null ?	prepareFilteredSearchQuery(searchDTO) : prepareSearchQuery(searchDTO)) : prepareSearchQuery(searchDTO);
 
+	}
 }
\ No newline at end of file
diff --git a/search-api/search-service/conf/application.conf b/search-api/search-service/conf/application.conf
index a803688db..63dd77bd9 100644
--- a/search-api/search-service/conf/application.conf
+++ b/search-api/search-service/conf/application.conf
@@ -293,7 +293,7 @@ search.config.path=/home/learning/platform/search
 cache.type="redis"
 
 search.es_conn_info="localhost:9200"
-search.fields.query=["name^100","title^100","lemma^100","code^100","domain","subject","description^10","keywords^100","ageGroup^10","filter^10","theme^10","genre^10","objects^25","contentType^100","language^200","teachingMode^25","skills^10","learningObjective^10","curriculum^100","gradeLevel^100","developer^100","attributions^10","identifier^100","IL_UNIQUE_ID^100","owner^50","board^100","relatedBoards^100","creator^100", "dialcodes^100","text","words","releaseNotes"]
+search.fields.query=["name^100.0","keywords^60.0","competencies_v3.name^60.0","systemTopics^60","purpose^60","source^50.0","description^5.0","language^5.0"]
 search.fields.date=["lastUpdatedOn","createdOn","versionDate","lastSubmittedOn","lastPublishedOn"]
 search.fields.mode_collection=["identifier","name","objectType","contentType","mimeType","size","childNodes","board","subject","medium","gradeLevel","appIcon", "origin", "originData"]
 search.batch.size=500