solved bug with mapping, reduced the mapping DB