Fixed issues with changing ids to Combos.

Changed code to use ComboCriteria when performing lookups.
More movement to ComboCriteria
Fixed issues with the ComboCriteria builder not working properly.