remove ref to canopy_call
fix gazetteer block_data