db: added escape_key() instead of enclose_field_name, escape_val() instead of enclose_field_value