fixed date selector issues