code fix and filters