hot fix fields query