Restore fix to live filter (ab7d7a1)

/cc @shaunandrews