Added the ability to annotate filters for each form element. Made some fixes of issues discovered while reviewing code.
Refactored code. A test is broken now.