Improve site controller index query