commit-nov 19

all data required for discovery added to query
add user-> user-id returned