Expiration search tweaks

Some refactoring, UI fixes, etc. for your "expiration date search" feature. **NOTE:** This PR is to go into your branch; it's not set up to go directly to master.