Use addClass() correctly, otherwise references don't get the 'reference' class

Change-Id: Ifae04e480f3e92725e15cae53119b0935e83b72a
Merge "Use addClass() correctly, otherwise references don't get the 'reference' class"