This is a very basic (and inefficient, and prone to cause thread starvation) change that causes
MAM queries to be responded to only after all relevant data has become available in the database.