Allow user-created markers on local map (Fixes #1571)
Minor cleanup