Solved small issue preventing page from loading if no data
Merge branch 'master' into gmaps