Put back the handling for custom in StateMachine_Search

Update civicrm_generated.mysql

Move the rest of the menu over