All Sites: Use natural sorting for terms

Fixes gh-268
Closes gh-298