Protocols search form improvments