Remove an extra "in: query" tag and fix other errors