Filtering UI still has bugs