Fix issues and set filter to work faster