[FIX] passing subject / object constraints to referenced queries
comment statement extension as possibly redundant to mapping table extension