Eric: Refactor of the site search using active search (better, stronger, faster).