Misc bug fixes

Miscellaneous bug fixes and clean-up that I want to get merged so that I they don't get stale as other merges get committed.
 - Code refactoring to fix a bug where the last disc-golf hole added to the map didn't have the same visual style as the rest, and either didn't have a basket icon, or didn't have either arrow, depending on the filter setting
 - ConfigModel bug-fix that was causing the disc-golf filter settings to get improperly loaded from the user defaults store