Added query type selector
Removed alias field
Implemented granularity override
Better label
Added support for clearing current filter
Added some filter validation
Some progress on making filters more generic