fix map iterator
fix for comprehension and relation color selection