Possible all Search fixes