Some fixes on specific search forms