Fix for searching system groups