PRD-4577 Fix the selection of properties, datasources, and structure pan...

reverse the parameters passed to new method (root cause of issue)