Fix urls mapping