where statement parsing added