LQE-66 - Refactoring of filtered list