W2 input uses code q in box 12.  That is OK.  But then you need to input screen 4 under misc for efile processing, there is a dropdown for Special Military Processing and date entered combat zone.  This dropdown box still lists theaters that were closed over 15 years ago!  Not the current ones.