Quick Fix: enforce Upcomming events limit

#11

The whole function could be made more efficient.  This is just a quick hotfix to enforce the limit