Synced changes from site

Changes from live site, including changes to search