removed wcsitem annd imporved the queries