(#1185) - break out GQL