Updated finding_template and added V-22341