fixed remaining uses of old Equals functionality in hashmap