Fix query generation through inherited methods
Update remaining controllers.