Watch History Filter Failure

Hello,

First of all, I really like the new features available for the watch history. They are all very helpful. However, there seems to be a performance issue on my end.

My watch history currently consists of 1887 titles, but when I try to filter some items (e.g. the not rated ones or with specific release date) the number grows to a gargantuan value. Could you please let me know if anything can be done to fix this?

Here is a couple of screenshots: