support query on embedded model
Merge branch 'denormalization-2'