Badges refactored to dict
All search auto works