Added possibility to select from which windows to choose 
(all or current workspace only)