Split between single and list queries