Add improved search capabilities/results