better quote matching