switching to mapcat, which also flattens one level
changing the double nested bq to use a list form
making sure the complex definition works too