Retool this so that existing query args in the URI are processed correctly