highlighting nits and fix filtering

  Defect Number:
    Reviewed By:
   Testing Done: