Group and Date selector,s refactoring