Fixes unneeded :include propagation.
Adds query defaults to model/gather (oy vay)