Adding more filters and page counting
Merge branch 'volume-dashboard'