fix APO selection drop down on item registration page

• fix the query that populates the APO select box on the item registration page
• clean up code, add tests

query issues were exposed by an upgrade to solr 6.1.

see issue #766.