Significantly decrease number of allowed entity expansion operations