Move switch-case to static dictionary + handle the last query type (regions)