Some tweaks to the NCBI connector
Merge remote-tracking branch 'upstream3/master'