Added better handling of queries of embedded models in IterableFields