adding tags for fw