Tweak entity limit and behavior