Can't switch query back to simple mode from custom

Seems to works to with me, maybe there is a specific query you are converting back?

Could you paste the query and maybe add a debug log when it happens, see: