improved marker placement and default orgUnit selection