Updated marker functionality