map service context fixes