now queries are created by op
bug resolved
code formating