Merge pull request #83 from alexsong93/array-fix

Fix empty array issue with filtering