fix multiple match calculation
revert wrongly commited change
add NEWS entry