Fix: handle url without query string