Enabled calculating boundaries only if needed and the setting of the boundary style