Fix execute query