Improved the Searching piece, by placing validations in place for various use cases