Proper handling of tags