More entitlements

Added some filtering on top of ahgittin/more-entitlements