Bug/master/better handling of quotes for subsettings