Fix issue with index_path of filtered data
Fixes Issue 523
Merge pull request #560 from ryanlntn/fix/pm-issue-523

Fix Issue 523