Really fix #304 by using AND instead of OR.

Also fixed up a permissions lookup for corporation
assets along with a uery bug