Mbst 9893 more granular uploads

Same here. You can probably extract this in a checkIsItem method, avoiding duplication with the method above