Added facility to change underscores by double slash in queries