FIx issue in AttachDataSource for ProductTemplate