Workspaces Fixes in Record Selection