Refactoring of the custom location map code, added POI to second pin