Fluid query feature added. Limited testing.