Merge pull request #55 from menghong777/master

Filtering working well but staff type ALL not working.