Add optional filtering for current contracts