more A&P fixes in subcollection