CDT3 Mapping expansion for Demapper Query Space