Select directive enhanced - TODO: full date.

Signed-off-by: Ljubomir Papuga <papuga.yu@gmail.com>
I have fixed this issue, you will be able to see the changes after next push.