Splitting search object into categories

Splitting search into Position and Citizenship
Everything is an OR search, need to switch to AND between categories...