Merge pull request #407 from blaine-O/master

More Cleanup
Separated Filter by Attribute and Rating