Shorter UI text and >= date comparison instead of > (cherry picked from commit 6ba052d2aff8023f4e6bdfc79eb8c0662b27fdf5)