Fixes to grouping works, fix abbreviations
Fix null dates
Remove unused code
Fixes for allowing grouped and non-grouped searching to coexist