Merge pull request #2 from ohader/master

Workspaces Fixes in Record Selection