Fixing group by time & time as identifier conflict