Separate Tag and Class in TagRef (fixes #120)