Duplication now uses new Query Model

Updated the duplication functionality to use the new Query Model.