Fix mapping of names to json

Also allow upper case search strings