Add todos for Dict query filering