added custom query opt