#55 Improve results page performances