fixed tooltip and certain field names on queries