search customization; fix queries