#822 - more progress on upload status tracking - more efficient filtering, handle UUID overrides