Fix self following, group order by query, time zone