Ld filters refactor