#5 start the changes for filter queries