FL-66: real update to tap and bond templates, missed somehow