Created Issue: MrMAPI -store parameter ate options that followed it [16005]

Problem: MrMAPI -store parameter ate options that followed it
Fix: Check for switches. Also more work to distinguish a store number from a naked prop tag.