Moved deferAction into the base for each model from the query entity