Numeric tags and SEF fix

The same PR as 1587 but now vs Master