Fixed 500 error and controlled vocab list