fixing the creation of URL params when baseParams are used, including tests