refactor fixurl