Move obsoletedBy out of the filter query