Fixed thread-group as list. Improvements for matching the value of 'value' field