fix for timespan-selector
merge branch 'development'