Fix page 2 fields search logic