Improved filters and fixed some issues