Improved query IMMENSELY

Death to that awful switch