remove extra closing tag
fix for attribute reference
give search field a better id
add missing closing tags