Add attribute search and fix number formatting