ummsearch & ammsearch fixes