Key matches now arrays , changed uppercase detection