Abstracted marker data retrieval

To minimize redundancy in FeatureCollection and Tree graph data
structures
Fixed a couple of minor bugs