add full search fixes