GEOS5620 WMS-EO - fixes & refactoring