Eric:Updates to filters, search