AUS-2548: Streamline the portal UI: fix multiple ID bug