[mod] stronger query
[mod] new complex cases
[mod] refactor
[enh] use group to solve more cases