fix: add Form and Table to prevent collision while creating a resource

fix: add Form and Table to prevent collision while creating a resource #21680