Fix form and filters
Merge