Removed nested querying logic of same object for collection creation/update