Found simple solution for the tags issue