Cleaned up SearchAdapter