fixed inconsistent data structure for recent mappings - changed queries