Search fix from dev