usability tweaks ot group and limit