Fix favorite and history server tabs never including empty servers instead of always including them