CD-collection: fixed validation scope [Closes #11][Closes #12]