Merge pull request #1857 from ifung/dashboard

Split view on dashboard
Merge branch 'dashboard' of https://github.com/MarkUsProject/Markus into dashboard
Fix query