WMS-EO: fixes & refactoring