Encode a few more elements to make the XML parser happy.
Merge branch 'dryad-staging' into merge-staging
Merge remote-tracking branch 'origin/jima-search-results' into merge-staging
Undo changes on ViewMore button
Merge branch 'dryad-staging' into merge-staging