Fixes bug 1093792

Added filtering on is_staff and modified the existing test case