Fix bad WMS server performance
Merge pull request #604 from matthias-kuhn/wmsfix

Fix bad WMS server performance