Support more search params