more progress on geoserver and content models