Fix tag reference layout on FF (fixes #2159)