Simplify fulltime/parttime filters

Simplify fulltime/parttime filters as per #458