Updated to escape just ? and #