zg: improved search even more