Sorting and shop id fix 68 63

This should make sure the shop_id is deconflicted and migrated to a simple integer field.

Also rolled in a one-liner for the default sort on the Bikes page.