Issue #25

Also fixing the site issue for the other plugins and use limit_choice_to
to make admin pick up the limitations.