fixes delete page performance

fixes #2660
fixes #2659