Fixed two columns
Added GP filter and small refactoring
Merge pull request #3651 from lwyszomi/case-116271

Opm improvements