Feature/search by hostname

For review and merge