Fixed search while empty server bug