Make basic objective item based objective logic work
Improvements to detection in general