New beta library: Search function improvements