Add links tags <-> listing, fix issue with tags where new tags were not valid