select around improvements