Getting rid of unnecessary complications with filtres.
minor bug fixes, AND modifier