core-4876 fix refresh issue with search filter
core-4876 fix unit tests