edit template fix for Choice