Some changes to possibly facilitate search in the future