move form models to separate subdirectory
reduce code duplication in the result filter