Changed query to expression and eval to query