fixes
Merge pull request #536 from nla/bulkEdit-dsc-379

Please review and merge added few lookups and fixed few bugs