Updated regexp to handle iid and type at the end of the query string, even though production has e=mc2 at the end