add indexes for performance
Merge pull request #370 from DonutWorks/feature/issue-321

add indexes for performance