LPS-49520 Adjusting date/time picker tags