add spaces after commas
add BoolShouldQuery with minimum_should_match support