Library: improved filtering.