Fixed routing issues with hard-coded URLs