Fix multiple query windows