[[ Bug 13079 ]] Fix various issues with select command