remove changes to query methd