fix addtional national authorities

Signed-off-by: Blaise Fonseca <blaisefonseca@hotmail.com>
reduce timeout for loading security in workflow bar

Signed-off-by: Blaise Fonseca <blaisefonseca@hotmail.com>
handle exisiting CP selected.

Signed-off-by: Blaise Fonseca <blaisefonseca@hotmail.com>