Rework of primary search options to a more advanced setup.  Still needs proper translations added and the lookups for owner, etc. #180