Fix group lookup to key