Select keyVal fix

I think I can, I think I can, I think I can