uhd: modified tag preemption/gap handling