Small stuff + Mons own indexerquery

Not as nice as Leifs version. =)