Fix item and activity loading issues introduced recently