[CDF-227] Fixed bug where initializing CPK queries was not copying defaults.