adding filtering output
fixing filtering
fixing filtering
fixing filtering
doing query work