Search rest API tweaks