Fixes DEVELOPER-509

Also adding in ratings for filtering, needs to be tested though.