RSM fix for non-dispatched (site tags)