Modify entity to create filter query