Updated tags/senders logic