fixes #7834 - properly process incoming and updated hypervisors

changed unneeded map to each

changed 'if' style on code