fix small changes and filters begining