BISERVER-8504 - Added filter based on the extra roles defined