Filtered query extracotr fixes