Correctly handle 0 for the System ID's when filtering. Fixes #1619