Ensure the isDirty check can be performed correctly based on changed field
Refactor time range label into custom class