Fix contentApiQuery to default to None and also not send from client when empty
Merge remote-tracking branch 'origin/master'