fixed more issues with date select