Fix and re-enable search