Fixed filter saving issue when wrong field is selected