A bit better design for find bird form.