Updated filters to avoid duplicate names on update.
Added tests.