FS RT #28105 - per Ivan, not updating recur_%_cap fields ; simplified SQL a bit and reduced query count by 3