added get message to tag and improved form