QueryHumanizer: do not shorten all aliases
Merge remote-tracking branch 'origin/master'