Adding queryParams support from initial creation window