Improved search library and reports