Added support for hosted services
Made sure that only the search fields are displayed when displaying results, even if another field matches
Removed unneeded timeout function
Merge branch 'add_hosted_svcs'