added more tags support
moar tags support