Extended search: bugfixes and more filter options for CRE