Filter simplification

Not sure this works.  And i don't trust myself at this point.
Removal of excess filter logic.  Adding todos.
Seems to be a bug with average rating always being null even when the
json does have a value.
Code Documentation