fixed renaming issue for queries