HH-44075 remove magic number and hard-coded urls