Tweak officer data handling

Add if statements to correctly filter entries.