Add a return to separate different select situations

Sry for the previous mess.