Add `location` fields and `Category` for Cluster Image Scanning reports (!14)