Rework kwarg and query translation so they accept deep query strings