Fixed isValid again, added keys to franchise entries
Closed #46