Adjust regex to match rql params