JRFB357 fixed the query issue