re #857 - Show text when no results are available
Merge branch 'feature/857-traffic' into staging