Fix for nfo processing, added back the query cache defrag