Added WHERE to parser