Upload checker draft + changes in tagging