Refactor and change logic in product property effective values.