Some fixes to the use of active searches and not lists