handle multi value keys better