More search related fixes