I’ve updated the code & the blog with your solution — much better than the filter :)