Changed default routing to prevent trigger of automatic search