Small fixes in view and default time constraint
Merge remote-tracking branch 'origin/master'