Refactor lookups to remove duplication.
Move adding %s logic to the correct lookup.

This makes it much cleaner to override the `contains` lookup.
Add Min/Max validators for ranges.

Based on the whole range being less than/greater than the value.