add general metadata to upload
use new search url
fix merge issues