Fix autofocus on tag / assign