Bug fix & enhancements to have first version of crwaling & indexing