Simplified the sitesearch a bit