Better handling of similarity with some keys that don't exist