some tweaks and optimizations on workspace select