updates to allow for the new DB-based country selection