Verify if the form was found and made some performance improvements