Improve search & render faster