Design Changes and Security Fixes

This pull request replaces pillone/usntssearch#66, which was targeting the wrong branch.