Improve performance

focus on search and add site