Fixed bug for in keyvals for non-scalar keys/vals