Rationalise and fix Markers

Add FilledFlag, and remove redundant Markers