Improve time selection behaviour
Merge branch 'master' of github.com:enwida/idpRepo