Fix duplicate bubbles

After filtering, we were still displaying some points with no data.
We now remove these points when they have no data under the filter, and
add them back in later.