WIP - to clear decks. Untested
Merge branch 'master' into dropdowns2
Populate the drop down searches from digests of the full data, always.
Merge branch 'dropdowns2'