[2019] Shards reset to 1 when using filter

Thank you very much for putting in the time to find the cause of this bug and write it up! I’ve confirmed it on my end and made a note of it so we can fix it.