final changes for first 16 queries