Fix fact resolution in aggregate resolver

Not doing now, as currently there is no common cube utils class yet. Didn't want to introduce too many changes.