3.0 - Only clearing value bindings if the query was executed.

Closes #4926