Improve datatime input and entity selector