make USPS country id agnostic and use iso_code_3 instead
rearrange order of some SQL defaults
use clean query in admin/configuration