Updated with latest developments from tags plugin