Add Where & Remove Where

Add Where to XML
Remove Where from case_default.php