Fix for multi match query