Update suggestions and suggestion presets

Lots of resorting because we're using js with osmium now, which seems to sort thing differently.