Replaced None values, added custom queries for lic/lmic datasets