Fix: try to use filter select