Ignore uploads dirs
Added more fields for grouping