Added UCG state selectors to force-matching algorithm