added esm retail, wholesale forms, ability to switch forms and some
minor data integrity filters.