Replace select with filter and reimplement omit