several improves in users and events linking