Add clicked url to options
Merge branch 'testing_issue_16'