State to Search and Model State Fix
State to Search