Merge pull request #40 from tryagainconcepts/pullrequests/BAC-36

added filtering UID
Merge commit '494179d8c0573d0e5c4074d6aa1693d6c031f135' into pullrequests/BAC-36