added encoding for question marks