Improve filterGroup