updates for escaping message queries/limits