Fixed issue with removing points in funnel charts. Closes #2206