Improved Filter tool and Queries Work

Changes made