Map service references updated. Overflowing list handled