fixed form_finder and message model