Added functionality for grouped findings