Tweaks to support post query.