Fixed duplicated map entities drawing, fixed map entities drawing order