search criteria for registrants list

1. I would like to be able to use the search function to seach by invoice number.

2. It would be good if we could choose the options Include Group Billing Records in registrants management and Include Group Members Records in registrants management from the registrants page (to save having to constantly change the configuration when sending certificates / marking as paid / exporting registrants list, etc...)