Bugfix to remove hardcoding for checkout option page