typo fix
Added tags support