Fixes, added terms query