Better URL query build