Fix query modifier to accept that all toOnes are nested now