completed input error display
merged upstream
added match directive for forms