Bug Fixes in Select