added more tags support