Feature/finder url fix