fix key name

closes: #2672
skip empty serial numbers

closes: #2665