Fix returning url and Add update for indexing service
Add unit tests