[Client bug]: $search and $expand not working when mixed up together

[Client bug]: $search and $expand not working when mixed up together #323