Merge pull request #2616 from jaymzh/whitelist

Fix attribute whitelisting
First pass at fixing broken notifications
Fixing some code I changed unecessarily
Removing TODOs which are not necessary
Adding unit test coverage and updating per github review