Added search forms and filters