limited selections in select box; crosswalk update
merged changes