Import bug fixes (geo, blank predicate)