More work on custom factor search modal.