Changed windows reporting to be based off of image IDs and not flavor