When saving, prevent double entreis: overwrite the existing entry (actually, remove previous)
Extracted remove functionality
Removing of simple filters added
Extra checks for validating remove action added.