Fix multiple queries