Save URL properly with query params