added tag and tag_id to filter