Make search work again - more or less