Feature localize aggs ids

could use Optional orElse(T other) to avoid the ternary operator