another patch for optimizing FW queries