1. Row missing selection suggestion applied
2. code clean up & refactoring applied