bugfix + make it more mod_indexy