Fix whitelist bug + Fix comments in export + sanitizing input