Added ability to handle klick URL