Menu factory authorizing menu too many times

-Fixed, menu factory authorizing each menu four times instead of one,
because of return yield usage on queryable collections.