Feature search issue and configuration alignment issue fixed.