Cleaned up the events query
merged services.js