Simplified encoding/decoding process by removing unneeded semicolons from entity map