Add a return to separate different select situations