Improve row-finder performance and speed up view