Getting closer to acceptable query