#245 - Implement search