Fixed, improved tags and extra parameter support