Remove objects
Add queryMessage to item and search methods of ApiQuery
Fix call in test