Cleaner
Unit Tests for Query Item extraction
And now it actually passes it