Fix bugs with no geometry & interests