Moved main SQL to variable, to make it easier to print it.  Added extra data to each sql_plan_hash_value.