Task #41395 fixed url issue, added new function, rewrote logic