Refactor client
Fix broken track field
Fix query operators