Fixed construction of unique_id for search_keyword.
Various renames and fixes, uniprot uses name as symbol now.