Fix: current parameters not included in generated url