more search_params tweaks and some subcard handling improvements