fix search links
fix non-search links
Merge branch 'production'
change opp search sort