Add direct picky queries