Remove subrange which causes performance problems