Please take the time and report this encounter to his superiors. His command needs to know his officer is enforcing in-correct laws.
Please call up the main office and take the time to report your encounter so that this can be corrected also ask if they would not mind covering this in briefing so others will not have to deal with this officer and their encounter.
Thanks for standing up for your rights you did a great job. What I have learned from my encounters with OEO's are if they ask if it is loaded I don't answer them instead I ask if I am free to go or if I am under arrest.
Good Job on your encounter