Fix misc

Author: pawankartik-elastic

server/src/main/java/org/elasticsearch/rest/action/search/RestSearchAction.java

@@ -109,7 +109,7 @@ public RestChannelConsumer prepareRequest(final RestRequest request, final NodeC
         request.param("min_compatible_shard_node");
 
         final boolean crossProjectEnabled = crossProjectModeDecider.crossProjectEnabled();
-        if (crossProjectEnabled && searchRequest.allowsCrossProject()) {
+        if (crossProjectEnabled) {
             searchRequest.setProjectRouting(request.param("project_routing"));
         }
 
@@ -243,7 +243,7 @@ public static void parseSearchRequest(
         searchRequest.routing(request.param("routing"));
         searchRequest.preference(request.param("preference"));
         IndicesOptions indicesOptions = IndicesOptions.fromRequest(request, searchRequest.indicesOptions());
-        if (crossProjectEnabled) {
+        if (crossProjectEnabled && searchRequest.allowsCrossProject()) {
             indicesOptions = IndicesOptions.builder(indicesOptions)
                 .crossProjectModeOptions(new IndicesOptions.CrossProjectModeOptions(true))
                 .build();