Bit of work in index and fixed some regex