Stage7: fixed the ext-stores-q functionality