Search continues

Now with custom KeyValuePair class and a custom SearchAdapter