Add original name filter and ability to search by multiple fields