add filters
Improve filters mechanics
Improve and cleanup