better tags support
now with full tag support
Fixed fence post error