ToursBugFix531.538

Issue 1: https://github.com/alterm4nn/ChronoZoom/issues/531 

Issue 2: https://github.com/alterm4nn/ChronoZoom/issues/538

Code Review: http://mrccodereview.cloudapp.net/ui#review:id=1233