fix left over
Even more left overs, removed all references to old _chosen and _active
More templating for finding matching keys
Missed two functions to use templates