Fix for duplicating server listings