@w0qj: I get the impression that X1 is just going after the corporate market now and is no way interested in end-user type customers. No free version anymore, new licences and the new eDiscovery version of X1.

Who knows though, maybe X1 v7 will have some of the features you're after. Fingers crossed still.