Fixed 'responsible party' filter, also refactored code.