fixed switch query :)