Products Page fixes for DEVELOPER-381 and DEVELOPER-382