:bird: the extra query should be on display...  concurrency issues incoming