Fix/geo catalog refresh

About #696 Fix geocatalog refresh. And fix the last half of ticket #671.