updated Data Controller to Detect GROUP BY instead of forcing table.