Fix bug in annotation tool
Tweak lazy config for WMSSource