Fixed filters and errors
.
Revert "."

This reverts commit 28a07cb55bd5e285515ff247853d9726281760c4.
.
.
Revert "."

This reverts commit 1416dcb7acae73d26018f43ecbf9bbd5c5220efb.