Tweak search params again (bearing in mind #178)