Refactored in prep to fix regression where filters don't work in dashboard