applied some fixes to the searching in the Site.Master.cs and Site.cs