Filters remake, bugfix