Fixed filter application to empty fields