need to check query part