Restore uniq option (fixes 1 spec)
Do not force saving of an invalid category.

Fixes 5 specs