Fixes DEVELOPER-509

Also adding in ratings for filtering, needs to be tested though.
Fixes DEVELOPER-508 (qs in product get started)
Resolve issues with DEVELOPER-508 and DEVELOPER-509