Improvments when no selection