move feature option in search drop down
Merge remote-tracking branch 'origin/staging' into staging