Add initial where support
Fix test for get