fixed issues with time selection and simplified