Tweaks to traditional catalog link on main search
Merge branch 'development' into templates