Move location relation from Entity/LocationAwareCalendarEntity to CalendarEntity.
Add filter on category with the location id parameter