Adding query of subcollection field as well