issue #22155: First pass refactor to allow more flexability on custom item site fetches.
issue #22155: Fill out vendor orms a little more.