add proper url param parsing