Dropping comment.
Also include user-id in find-next-values; Use find-next-values for find-next-value adhering to vetos;
Renaming and small refactoring;