Manual upload after search / improved rake