Improve URL builiding
Improve filters handling