Wire up update action
Add support to conflicting controllers
Simplify filter logic