Search feature flag added and more pr requests addressed