Added additional search attributes to Attribute Search page. Misc cleanup.