diff --git a/age--1.4.0.sql b/age--1.4.0.sql
index 6112a0398..49c2d2bdd 100644
--- a/age--1.4.0.sql
+++ b/age--1.4.0.sql
@@ -143,7 +143,7 @@ CREATE TYPE graphid;
 CREATE FUNCTION ag_catalog.graphid_in(cstring)
 RETURNS graphid
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -151,7 +151,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.graphid_out(graphid)
 RETURNS cstring
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -247,7 +247,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.graphid_gt(graphid, graphid)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -265,7 +265,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.graphid_le(graphid, graphid)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -283,7 +283,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.graphid_ge(graphid, graphid)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -306,7 +306,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.graphid_btree_cmp(graphid, graphid)
 RETURNS int
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -315,7 +315,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.graphid_btree_sort(internal)
 RETURNS void
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -382,7 +382,7 @@ CREATE TYPE agtype;
 CREATE FUNCTION ag_catalog.agtype_in(cstring)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -390,7 +390,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.agtype_out(agtype)
 RETURNS cstring
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1422,7 +1422,7 @@ CREATE OPERATOR CLASS graphid_ops_hash
 CREATE FUNCTION ag_catalog.agtype_eq(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1441,7 +1441,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(agtype, smallint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1459,7 +1459,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(smallint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1477,7 +1477,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(agtype, integer)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1495,7 +1495,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(integer, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1513,7 +1513,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(agtype, bigint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1531,7 +1531,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(bigint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1549,7 +1549,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(agtype, real)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1567,7 +1567,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(real, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1585,7 +1585,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(agtype, double precision)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1603,7 +1603,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(double precision, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1621,7 +1621,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(agtype, numeric)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1639,7 +1639,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_any_eq(numeric, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1657,7 +1657,7 @@ CREATE OPERATOR = (
 CREATE FUNCTION ag_catalog.agtype_ne(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1675,7 +1675,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(agtype, smallint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1693,7 +1693,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(smallint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1711,7 +1711,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(agtype, integer)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1729,7 +1729,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(integer, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1747,7 +1747,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(agtype, bigint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1765,7 +1765,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(bigint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1783,7 +1783,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(agtype, real)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1801,7 +1801,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(real, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1819,7 +1819,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(agtype, double precision)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1837,7 +1837,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(double precision, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1855,7 +1855,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(agtype, numeric)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1873,7 +1873,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_any_ne(numeric, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1891,7 +1891,7 @@ CREATE OPERATOR <> (
 CREATE FUNCTION ag_catalog.agtype_lt(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1909,7 +1909,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(agtype, smallint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1927,7 +1927,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(smallint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1945,7 +1945,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(agtype, integer)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1963,7 +1963,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(integer, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1981,7 +1981,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(agtype, bigint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -1999,7 +1999,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(bigint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2017,7 +2017,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(agtype, real)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2035,7 +2035,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(real, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2053,7 +2053,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(agtype, double precision)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2071,7 +2071,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(double precision, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2089,7 +2089,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(agtype, numeric)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2107,7 +2107,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_any_lt(numeric, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2125,7 +2125,7 @@ CREATE OPERATOR < (
 CREATE FUNCTION ag_catalog.agtype_gt(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2143,7 +2143,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(agtype, smallint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2161,7 +2161,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(smallint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2179,7 +2179,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(agtype, integer)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2197,7 +2197,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(integer, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2215,7 +2215,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(agtype, bigint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2233,7 +2233,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(bigint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2251,7 +2251,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(agtype, real)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2269,7 +2269,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(real, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2287,7 +2287,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(agtype, double precision)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2305,7 +2305,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(double precision, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2323,7 +2323,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(agtype, numeric)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2341,7 +2341,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_any_gt(numeric, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2359,7 +2359,7 @@ CREATE OPERATOR > (
 CREATE FUNCTION ag_catalog.agtype_le(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2377,7 +2377,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(agtype, smallint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2395,7 +2395,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(smallint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2413,7 +2413,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(agtype, integer)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2431,7 +2431,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(integer, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2449,7 +2449,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(agtype, bigint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2467,7 +2467,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(bigint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2485,7 +2485,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(agtype, real)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2503,7 +2503,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(real, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2521,7 +2521,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(agtype, double precision)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2539,7 +2539,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(double precision, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2557,7 +2557,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(agtype, numeric)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2575,7 +2575,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_any_le(numeric, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2593,7 +2593,7 @@ CREATE OPERATOR <= (
 CREATE FUNCTION ag_catalog.agtype_ge(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2611,7 +2611,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(agtype, smallint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2629,7 +2629,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(smallint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2647,7 +2647,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(agtype, integer)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2665,7 +2665,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(integer, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2683,7 +2683,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(agtype, bigint)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2701,7 +2701,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(bigint, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2719,7 +2719,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(agtype, real)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2737,7 +2737,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(real, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2755,7 +2755,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(agtype, double precision)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2773,7 +2773,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(double precision, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2791,7 +2791,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(agtype, numeric)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2809,7 +2809,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_any_ge(numeric, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2827,7 +2827,7 @@ CREATE OPERATOR >= (
 CREATE FUNCTION ag_catalog.agtype_btree_cmp(agtype, agtype)
 RETURNS INTEGER
 LANGUAGE c
-STABLE
+IMMUTABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
@@ -2956,7 +2956,7 @@ CREATE OPERATOR #>> (
 CREATE FUNCTION ag_catalog.agtype_contains(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -2973,7 +2973,7 @@ CREATE OPERATOR @> (
 CREATE FUNCTION ag_catalog.agtype_contained_by(agtype, agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3156,7 +3156,7 @@ STORAGE text;
 CREATE FUNCTION ag_catalog.graphid_to_agtype(graphid)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3167,7 +3167,7 @@ WITH FUNCTION ag_catalog.graphid_to_agtype(graphid);
 CREATE FUNCTION ag_catalog.agtype_to_graphid(agtype)
 RETURNS graphid
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3183,7 +3183,7 @@ AS IMPLICIT;
 CREATE FUNCTION ag_catalog._agtype_build_path(VARIADIC "any")
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3225,7 +3225,7 @@ as 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.agtype_build_map(VARIADIC "any")
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3233,7 +3233,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.agtype_build_map()
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME', 'agtype_build_map_noargs';
@@ -3241,7 +3241,7 @@ AS 'MODULE_PATHNAME', 'agtype_build_map_noargs';
 CREATE FUNCTION ag_catalog.agtype_build_map_nonull(VARIADIC "any")
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3267,7 +3267,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.agtype_build_list(VARIADIC "any")
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3275,7 +3275,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.agtype_build_list()
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 CALLED ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME', 'agtype_build_list_noargs';
@@ -3287,7 +3287,7 @@ AS 'MODULE_PATHNAME', 'agtype_build_list_noargs';
 CREATE FUNCTION ag_catalog.agtype_to_text(agtype)
 RETURNS text
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3299,7 +3299,7 @@ WITH FUNCTION ag_catalog.agtype_to_text(agtype);
 CREATE FUNCTION ag_catalog.agtype_to_bool(agtype)
 RETURNS boolean
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3312,7 +3312,7 @@ AS IMPLICIT;
 CREATE FUNCTION ag_catalog.bool_to_agtype(boolean)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3324,7 +3324,7 @@ WITH FUNCTION ag_catalog.bool_to_agtype(boolean);
 CREATE FUNCTION ag_catalog.float8_to_agtype(float8)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3336,7 +3336,7 @@ WITH FUNCTION ag_catalog.float8_to_agtype(float8);
 CREATE FUNCTION ag_catalog.agtype_to_float8(agtype)
 RETURNS float8
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3348,7 +3348,7 @@ WITH FUNCTION ag_catalog.agtype_to_float8(agtype);
 CREATE FUNCTION ag_catalog.int8_to_agtype(int8)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3360,7 +3360,7 @@ WITH FUNCTION ag_catalog.int8_to_agtype(int8);
 CREATE FUNCTION ag_catalog.agtype_to_int8(variadic "any")
 RETURNS bigint
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3373,7 +3373,7 @@ AS ASSIGNMENT;
 CREATE FUNCTION ag_catalog.agtype_to_int4(variadic "any")
 RETURNS int
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3385,7 +3385,7 @@ WITH FUNCTION ag_catalog.agtype_to_int4(variadic "any");
 CREATE FUNCTION ag_catalog.agtype_to_int2(variadic "any")
 RETURNS smallint
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3397,7 +3397,7 @@ WITH FUNCTION ag_catalog.agtype_to_int2(variadic "any");
 CREATE FUNCTION ag_catalog.agtype_to_int4_array(variadic "any")
     RETURNS int[]
     LANGUAGE c
-    STABLE
+    IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3420,14 +3420,14 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.agtype_access_slice(agtype, agtype, agtype)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
 CREATE FUNCTION ag_catalog.agtype_in_operator(agtype, agtype)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
@@ -3454,7 +3454,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.agtype_string_match_contains(agtype, agtype)
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 RETURNS NULL ON NULL INPUT
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
@@ -3882,21 +3882,21 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.age_abs(variadic "any")
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
 CREATE FUNCTION ag_catalog.age_sign(variadic "any")
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
 CREATE FUNCTION ag_catalog.age_log(variadic "any")
 RETURNS agtype
 LANGUAGE c
-STABLE
+IMMUTABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
@@ -4227,7 +4227,7 @@ AS 'MODULE_PATHNAME';
 CREATE FUNCTION ag_catalog.age_build_vle_match_edge(agtype, agtype)
 RETURNS agtype
 LANGUAGE C
-STABLE
+IMMUTABLE
 PARALLEL SAFE
 AS 'MODULE_PATHNAME';
 
diff --git a/regress/expected/cypher_match.out b/regress/expected/cypher_match.out
index 6f565affb..8bf65b4fa 100644
--- a/regress/expected/cypher_match.out
+++ b/regress/expected/cypher_match.out
@@ -2514,10 +2514,10 @@ SELECT count(*) FROM cypher('test_enable_containment', $$ MATCH (x:Customer {pho
 (1 row)
 
 SELECT * FROM cypher('test_enable_containment', $$ EXPLAIN (COSTS OFF) MATCH (x:Customer {school:{name:'XYZ',program:{degree:'BSc'}},phone:[987654321],parents:{}}) RETURN x $$) as (a agtype);
-                                                                                                                                        QUERY PLAN                                                                                                                                         
--------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+                                                             QUERY PLAN                                                             
+------------------------------------------------------------------------------------------------------------------------------------
  Seq Scan on "Customer" x
-   Filter: (properties @> agtype_build_map('school'::text, agtype_build_map_nonull('name'::text, '"XYZ"'::agtype, 'program'::text, agtype_build_map_nonull('degree'::text, '"BSc"'::agtype)), 'phone'::text, agtype_build_list('987654321'::agtype), 'parents'::text, agtype_build_map()))
+   Filter: (properties @> '{"phone": [987654321], "school": {"name": "XYZ", "program": {"degree": "BSc"}}, "parents": {}}'::agtype)
 (2 rows)
 
 -- Previous set of queries, with enable_containment off
diff --git a/src/backend/parser/cypher_clause.c b/src/backend/parser/cypher_clause.c
index da2595233..297af5487 100644
--- a/src/backend/parser/cypher_clause.c
+++ b/src/backend/parser/cypher_clause.c
@@ -4377,11 +4377,12 @@ transform_match_create_path_variable(cypher_parsestate *cpstate,
                                      cypher_path *path, List *entities)
 {
     ParseState *pstate = (ParseState *)cpstate;
-    Oid build_path_oid;
-    FuncExpr *fexpr;
-    int resno;
+    Oid build_path_oid = InvalidOid;
+    Expr *expr = NULL;
+    int resno = -1;
     List *entity_exprs = NIL;
-    ListCell *lc;
+    ListCell *lc = NULL;
+    bool null_path_entity = false;
 
     if (list_length(entities) < 1)
     {
@@ -4391,28 +4392,51 @@ transform_match_create_path_variable(cypher_parsestate *cpstate,
                  parser_errposition(pstate, path->location)));
     }
 
-    // extract the expr for each entity
+    /* extract the expr for each entity */
     foreach (lc, entities)
     {
         transform_entity *entity = lfirst(lc);
 
         if (entity->expr != NULL)
         {
+            /*
+             * Is it a NULL constant, meaning there was an invalid label?
+             * If so, flag it for later
+             */
+            if (IsA(entity->expr, Const) &&
+                ((Const*)(entity->expr))->constisnull)
+            {
+                null_path_entity = true;
+            }
+
             entity_exprs = lappend(entity_exprs, entity->expr);
         }
     }
 
-    // get the oid for the path creation function
+    /* get the oid for the path creation function */
     build_path_oid = get_ag_func_oid("_agtype_build_path", 1, ANYOID);
 
-    // build the expr node for the function
-    fexpr = makeFuncExpr(build_path_oid, AGTYPEOID, entity_exprs, InvalidOid,
-                         InvalidOid, COERCE_EXPLICIT_CALL);
+    /*
+     * If we have a NULL in the path, there is an invalid label, so there aren't
+     * any paths to be selected - the path variable will be NULL. In this case
+     * we need to return a NULL constant instead.
+     */
+    if (null_path_entity)
+    {
+        expr = (Expr*)makeNullConst(AGTYPEOID, -1, InvalidOid);
+    }
+    /* otherwise, build the expr node for the function */
+    else
+    {
+        expr = (Expr*)makeFuncExpr(build_path_oid, AGTYPEOID, entity_exprs,
+                                   InvalidOid, InvalidOid,
+                                   COERCE_EXPLICIT_CALL);
+    }
 
     resno = cpstate->pstate.p_next_resno++;
 
-    // create the target entry
-    return makeTargetEntry((Expr *)fexpr, resno, path->var_name, false);
+    /* create the target entry */
+    return makeTargetEntry(expr, resno, path->var_name, false);
 }
 
 /*
diff --git a/src/backend/parser/cypher_expr.c b/src/backend/parser/cypher_expr.c
index 16346a698..5a0a8222f 100644
--- a/src/backend/parser/cypher_expr.c
+++ b/src/backend/parser/cypher_expr.c
@@ -95,6 +95,8 @@ static Node *transform_FuncCall(cypher_parsestate *cpstate, FuncCall *fn);
 static Node *transform_WholeRowRef(ParseState *pstate, RangeTblEntry *rte,
                                    int location);
 static ArrayExpr *make_agtype_array_expr(List *args);
+static Node *transform_column_ref_for_indirection(cypher_parsestate *cpstate,
+                                                  ColumnRef *cr);
 
 /* transform a cypher expression */
 Node *transform_cypher_expr(cypher_parsestate *cpstate, Node *expr,
@@ -785,6 +787,50 @@ static ArrayExpr *make_agtype_array_expr(List *args)
     return newa;
 }
 
+/*
+ * Transform a ColumnRef for indirection. Try to find the rte that the ColumnRef
+ * references and pass the properties of that rte as what the ColumnRef is
+ * referencing. Otherwise, reference the Var.
+ */
+static Node *transform_column_ref_for_indirection(cypher_parsestate *cpstate,
+                                                  ColumnRef *cr)
+{
+    ParseState *pstate = (ParseState *)cpstate;
+    RangeTblEntry *rte = NULL;
+    Node *field1 = linitial(cr->fields);
+    char *relname = NULL;
+    Node *node = NULL;
+
+    Assert(IsA(field1, String));
+    relname = strVal(field1);
+
+    /* locate the referenced RTE */
+    rte = find_rte(cpstate, relname);
+
+    /* if we didn't find anything, return NULL */
+    if (!rte)
+    {
+        return NULL;
+    }
+
+    /* find the properties column of the NSI and return a var for it */
+    node = scanRTEForColumn(pstate, rte, "properties", cr->location, 0, NULL);
+
+    /*
+     * Error out if we couldn't find it.
+     *
+     * TODO: Should we error out or return NULL for further processing?
+     *       For now, just error out.
+     */
+    if (!node)
+    {
+        ereport(ERROR, (errcode(ERRCODE_UNDEFINED_OBJECT),
+                        errmsg("could not find properties for %s", relname)));
+    }
+
+    return node;
+}
+
 static Node *transform_A_Indirection(cypher_parsestate *cpstate,
                                      A_Indirection *a_ind)
 {
@@ -806,8 +852,25 @@ static Node *transform_A_Indirection(cypher_parsestate *cpstate,
     func_slice_oid = get_ag_func_oid("agtype_access_slice", 3, AGTYPEOID,
                                      AGTYPEOID, AGTYPEOID);
 
-    /* transform indirection argument expression */
-    ind_arg_expr = transform_cypher_expr_recurse(cpstate, a_ind->arg);
+    /*
+     * If the indirection argument is a ColumnRef, we want to pull out the
+     * properties, as a var node, if possible.
+     */
+    if (IsA(a_ind->arg, ColumnRef))
+    {
+        ColumnRef *cr = (ColumnRef *)a_ind->arg;
+
+        ind_arg_expr = transform_column_ref_for_indirection(cpstate, cr);
+    }
+
+    /*
+     * If we didn't get the properties from a ColumnRef, just transform the
+     * indirection argument.
+     */
+    if (ind_arg_expr == NULL)
+    {
+        ind_arg_expr = transform_cypher_expr_recurse(cpstate, a_ind->arg);
+    }
 
     /* get the location of the expression */
     location = exprLocation(ind_arg_expr);
diff --git a/src/backend/utils/adt/agtype_ops.c b/src/backend/utils/adt/agtype_ops.c
index 715b72660..b1e8f666f 100644
--- a/src/backend/utils/adt/agtype_ops.c
+++ b/src/backend/utils/adt/agtype_ops.c
@@ -1165,8 +1165,10 @@ PG_FUNCTION_INFO_V1(agtype_contains);
  */
 Datum agtype_contains(PG_FUNCTION_ARGS)
 {
-    agtype_iterator *constraint_it, *property_it;
-    agtype *properties, *constraints;
+    agtype_iterator *constraint_it = NULL;
+    agtype_iterator *property_it = NULL;
+    agtype *properties = NULL;
+    agtype *constraints = NULL;
 
     if (PG_ARGISNULL(0) || PG_ARGISNULL(1))
     {
@@ -1176,8 +1178,13 @@ Datum agtype_contains(PG_FUNCTION_ARGS)
     properties = AG_GET_ARG_AGTYPE_P(0);
     constraints = AG_GET_ARG_AGTYPE_P(1);
 
-    constraint_it = agtype_iterator_init(&constraints->root);
+    if (AGT_ROOT_IS_OBJECT(properties) != AGT_ROOT_IS_OBJECT(constraints))
+    {
+        PG_RETURN_BOOL(false);
+    }
+
     property_it = agtype_iterator_init(&properties->root);
+    constraint_it = agtype_iterator_init(&constraints->root);
 
     PG_RETURN_BOOL(agtype_deep_contains(&property_it, &constraint_it));
 }