Improved documentation and added exceptions for search