Fix json; short-circuit geometry logic