Where clasue parsing improved.