Refactor helper function
Clean up some code
Add filters to Summaries table