Helios: better account to the "query hacking"