Better test. Fix deep query.