added validation and selection changes
Authored by: samantprajakta 2013-06-25
Parent: [r905]
Child: [r907]