Added fix for not querying with uppercase names