Refactored how EF Events checks for more products