More refactoring. Filter form.
Fixes for add.