Feature #1607: Fix goup_by hiding