Removed unnecessary query elements