Minor changes to org capture templates