Pull request for: Simple search 2