fixes #334 - Server side indexing routine is falling down