Added performance improvements in nested group search