Adding ability to filter data by multiple factors