Handle CQL Maps correctly, fix bug with name/slice iterators