Modified Search Screen
Merge branch 'release/1.2.32.273'