FIX: Allow clicks on @names