Merge pull request #1327 from FHenry/3.4

[ bug #1159 ] Commercial search "other" give p.note do not exists
Merge branch '3.4' into 3.4_agefodd