Fix for run_query changes