Reorganised search urls