Fix hash consolidation for renaming field queries