fixed fetch of expand/flatten of embedded properties - issue #2937