fix to support subqueries and assume default target name for properties