fixing wms for display - performance issues still need to be addressed