Fixed issue with eta when only tag or number present