Add distance and fitlers
Bug fix createEvent