Update labels for drug categories

Instead of "Other Drug" use "Other or Unspecified Drug".  Instead
of "No Drug" use "Enhancement".