handling non-raw urls too now