integrate code review feedback (location.search)
Authored by: acucu 2010-11-01
Parent: [r146]
Child: [r148]