bug fix, speed(?) fix, change search collapse to just 6 digit entries for now