aom_fw-189 Must be optional if database query allows multiple queries