Version now works and allows email and user id search