resolve query issue