Fix parametrized entities to keep subs