Search Configuration View done and working propely
Merge remote-tracking branch 'origin/master'