Fix validation for collection names. Refs #14
Remove JS logic operators